parser: regenerate with lambda
[nit.git] / src / parser / parser.nit
index 9e11d70..b039c03 100644 (file)
 # Parser.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser
+module parser is generated, no_warning("missing-doc", "unread-variable")
 
 intrude import parser_prod
-import tables
+intrude import parser_work
+private import tables
 
-# State of the parser automata as stored in the parser stack.
-private class State
-       # The internal state number
-       readable writable var _state: Int
-
-       # The node stored with the state in the stack
-       readable writable var _nodes: nullable Object
-
-       init(state: Int, nodes: nullable Object)
-       do
-               _state = state
-               _nodes = nodes
-       end
-end
-
-class Parser
-       super TablesCapable
-       # Associated lexer
-       var _lexer: Lexer
-
-       # Stack of pushed states and productions
-       var _stack: Array[State]
-
-       # Position in the stack
-       var _stack_pos: Int
-
-       # Create a new parser based on a given lexer
-       init(lexer: Lexer)
-       do
-               _lexer = lexer
-               _stack = new Array[State]
-               _stack_pos = -1
-               build_reduce_table
-       end
-
-       # Do a transition in the automata
-       private fun go_to(index: Int): Int
-       do
-               var state = state
-               var low = 1
-               var high = parser_goto(index, 0) - 1
-
-               while low <= high do
-                       var middle = (low + high) / 2
-                       var subindex = middle * 2 + 1 # +1 because parser_goto(index, 0) is the length
-
-                       var goal = parser_goto(index, subindex)
-                       if state < goal then
-                               high = middle - 1
-                       else if state > goal then
-                               low = middle + 1
-                       else
-                               return parser_goto(index, subindex+1)
-                       end
-               end
-
-               return parser_goto(index, 2) # Default value
-       end
-
-       # Push someting in the state stack
-       private fun push(numstate: Int, list_node: nullable Object)
-       do
-               var pos = _stack_pos + 1
-               _stack_pos = pos
-               if pos < _stack.length then
-                       var state = _stack[pos]
-                       state.state = numstate
-                       state.nodes = list_node
-               else
-                       _stack.push(new State(numstate, list_node))
-               end
-       end
-
-       # The current state
-       private fun state: Int
-       do
-               return _stack[_stack_pos].state
-       end
-
-       # Pop something from the stack state
-       private fun pop: nullable Object
-       do
-               var res = _stack[_stack_pos].nodes
-               _stack_pos = _stack_pos -1
-               return res
-       end
-
-       # Build and return a full AST.
-       fun parse: Start
-       do
-               push(0, null)
-
-               var lexer = _lexer
-               loop
-                       var token = lexer.peek
-                       if token isa AError then
-                               return new Start(null, token)
-                       end
-
-                       var state = self.state
-                       var index = token.parser_index
-                       var action_type = parser_action(state, 2)
-                       var action_value = parser_action(state, 3)
-
-                       var low = 1
-                       var high = parser_action(state, 0) - 1
-
-                       while low <= high do
-                               var middle = (low + high) / 2
-                               var subindex = middle * 3 + 1 # +1 because parser_action(state, 0) is the length
-
-                               var goal = parser_action(state, subindex)
-                               if index < goal then
-                                       high = middle - 1
-                               else if index > goal then
-                                       low = middle + 1
-                               else
-                                       action_type = parser_action(state, subindex+1)
-                                       action_value = parser_action(state, subindex+2)
-                                       break
-                               end
-                       end
-
-                       if action_type == 0 then # SHIFT
-                               push(action_value, lexer.next)
-                       else if action_type == 1 then # REDUCE
-                               _reduce_table[action_value].action(self)
-                       else if action_type == 2 then # ACCEPT
-                               var node2 = lexer.next
-                               assert node2 isa EOF
-                               var node1 = pop
-                               assert node1 isa AModule
-                               var node = new Start(node1, node2)
-                               (new ComputeProdLocationVisitor).enter_visit(node)
-                               return node
-                       else if action_type == 3 then # ERROR
-                               var node2 = new AParserError.init_parser_error("Syntax error: unexpected {token}.", token.location, token)
-                               var node = new Start(null, node2)
-                               return node
-                       end
-               end
-       end
-
-       var _reduce_table: Array[ReduceAction]
-       private fun build_reduce_table
-       do
-               _reduce_table = new Array[ReduceAction].with_items(
-                       new ReduceAction0(0),
-                       new ReduceAction1(0),
-                       new ReduceAction2(0),
-                       new ReduceAction3(0),
-                       new ReduceAction4(0),
-                       new ReduceAction5(0),
-                       new ReduceAction6(0),
-                       new ReduceAction7(0),
-                       new ReduceAction8(0),
-                       new ReduceAction9(0),
-                       new ReduceAction10(0),
-                       new ReduceAction11(0),
-                       new ReduceAction12(0),
-                       new ReduceAction13(0),
-                       new ReduceAction14(0),
-                       new ReduceAction15(0),
-                       new ReduceAction16(0),
-                       new ReduceAction17(0),
-                       new ReduceAction18(0),
-                       new ReduceAction19(0),
-                       new ReduceAction20(0),
-                       new ReduceAction21(0),
-                       new ReduceAction22(0),
-                       new ReduceAction23(0),
-                       new ReduceAction24(0),
-                       new ReduceAction25(0),
-                       new ReduceAction26(0),
-                       new ReduceAction27(0),
-                       new ReduceAction28(0),
-                       new ReduceAction29(0),
-                       new ReduceAction30(0),
-                       new ReduceAction31(0),
-                       new ReduceAction32(0),
-                       new ReduceAction33(0),
-                       new ReduceAction34(0),
-                       new ReduceAction35(0),
-                       new ReduceAction36(0),
-                       new ReduceAction37(0),
-                       new ReduceAction38(0),
-                       new ReduceAction39(0),
-                       new ReduceAction40(0),
-                       new ReduceAction41(0),
-                       new ReduceAction42(0),
-                       new ReduceAction43(0),
-                       new ReduceAction44(0),
-                       new ReduceAction45(0),
-                       new ReduceAction46(0),
-                       new ReduceAction47(0),
-                       new ReduceAction48(0),
-                       new ReduceAction49(0),
-                       new ReduceAction50(0),
-                       new ReduceAction51(0),
-                       new ReduceAction52(0),
-                       new ReduceAction53(0),
-                       new ReduceAction54(0),
-                       new ReduceAction55(0),
-                       new ReduceAction56(0),
-                       new ReduceAction57(0),
-                       new ReduceAction58(0),
-                       new ReduceAction59(0),
-                       new ReduceAction60(0),
-                       new ReduceAction61(0),
-                       new ReduceAction62(0),
-                       new ReduceAction63(0),
-                       new ReduceAction64(1),
-                       new ReduceAction65(1),
-                       new ReduceAction66(2),
-                       new ReduceAction67(2),
-                       new ReduceAction68(2),
-                       new ReduceAction69(3),
-                       new ReduceAction70(3),
-                       new ReduceAction71(4),
-                       new ReduceAction71(4),
-                       new ReduceAction73(5),
-                       new ReduceAction74(5),
-                       new ReduceAction75(5),
-                       new ReduceAction76(5),
-                       new ReduceAction75(5),
-                       new ReduceAction78(5),
-                       new ReduceAction79(5),
-                       new ReduceAction78(5),
-                       new ReduceAction81(5),
-                       new ReduceAction82(5),
-                       new ReduceAction83(5),
-                       new ReduceAction84(5),
-                       new ReduceAction83(5),
-                       new ReduceAction86(5),
-                       new ReduceAction87(5),
-                       new ReduceAction86(5),
-                       new ReduceAction89(5),
-                       new ReduceAction90(5),
-                       new ReduceAction91(5),
-                       new ReduceAction92(5),
-                       new ReduceAction91(5),
-                       new ReduceAction94(5),
-                       new ReduceAction95(5),
-                       new ReduceAction94(5),
-                       new ReduceAction97(5),
-                       new ReduceAction98(5),
-                       new ReduceAction99(5),
-                       new ReduceAction100(5),
-                       new ReduceAction99(5),
-                       new ReduceAction102(5),
-                       new ReduceAction103(5),
-                       new ReduceAction102(5),
-                       new ReduceAction105(5),
-                       new ReduceAction106(5),
-                       new ReduceAction107(5),
-                       new ReduceAction108(5),
-                       new ReduceAction107(5),
-                       new ReduceAction110(5),
-                       new ReduceAction111(5),
-                       new ReduceAction110(5),
-                       new ReduceAction113(5),
-                       new ReduceAction114(5),
-                       new ReduceAction115(5),
-                       new ReduceAction116(5),
-                       new ReduceAction115(5),
-                       new ReduceAction118(5),
-                       new ReduceAction119(5),
-                       new ReduceAction118(5),
-                       new ReduceAction121(5),
-                       new ReduceAction122(5),
-                       new ReduceAction123(5),
-                       new ReduceAction124(5),
-                       new ReduceAction123(5),
-                       new ReduceAction126(5),
-                       new ReduceAction127(5),
-                       new ReduceAction126(5),
-                       new ReduceAction129(5),
-                       new ReduceAction130(5),
-                       new ReduceAction131(5),
-                       new ReduceAction132(5),
-                       new ReduceAction131(5),
-                       new ReduceAction134(5),
-                       new ReduceAction135(5),
-                       new ReduceAction134(5),
-                       new ReduceAction137(5),
-                       new ReduceAction138(5),
-                       new ReduceAction139(5),
-                       new ReduceAction140(5),
-                       new ReduceAction139(5),
-                       new ReduceAction142(5),
-                       new ReduceAction143(5),
-                       new ReduceAction142(5),
-                       new ReduceAction145(5),
-                       new ReduceAction146(5),
-                       new ReduceAction147(5),
-                       new ReduceAction148(5),
-                       new ReduceAction147(5),
-                       new ReduceAction150(5),
-                       new ReduceAction151(5),
-                       new ReduceAction150(5),
-                       new ReduceAction153(5),
-                       new ReduceAction154(5),
-                       new ReduceAction155(5),
-                       new ReduceAction156(5),
-                       new ReduceAction155(5),
-                       new ReduceAction158(5),
-                       new ReduceAction159(5),
-                       new ReduceAction158(5),
-                       new ReduceAction161(5),
-                       new ReduceAction162(5),
-                       new ReduceAction163(5),
-                       new ReduceAction164(5),
-                       new ReduceAction163(5),
-                       new ReduceAction166(5),
-                       new ReduceAction167(5),
-                       new ReduceAction166(5),
-                       new ReduceAction169(5),
-                       new ReduceAction170(5),
-                       new ReduceAction171(5),
-                       new ReduceAction172(5),
-                       new ReduceAction171(5),
-                       new ReduceAction174(5),
-                       new ReduceAction175(5),
-                       new ReduceAction174(5),
-                       new ReduceAction177(5),
-                       new ReduceAction178(5),
-                       new ReduceAction179(5),
-                       new ReduceAction180(5),
-                       new ReduceAction179(5),
-                       new ReduceAction182(5),
-                       new ReduceAction183(5),
-                       new ReduceAction182(5),
-                       new ReduceAction185(5),
-                       new ReduceAction186(5),
-                       new ReduceAction187(5),
-                       new ReduceAction188(5),
-                       new ReduceAction187(5),
-                       new ReduceAction190(5),
-                       new ReduceAction191(5),
-                       new ReduceAction190(5),
-                       new ReduceAction193(5),
-                       new ReduceAction194(5),
-                       new ReduceAction195(5),
-                       new ReduceAction196(5),
-                       new ReduceAction195(5),
-                       new ReduceAction198(5),
-                       new ReduceAction199(5),
-                       new ReduceAction198(5),
-                       new ReduceAction201(5),
-                       new ReduceAction202(5),
-                       new ReduceAction203(5),
-                       new ReduceAction204(5),
-                       new ReduceAction203(5),
-                       new ReduceAction206(5),
-                       new ReduceAction207(5),
-                       new ReduceAction206(5),
-                       new ReduceAction209(5),
-                       new ReduceAction210(5),
-                       new ReduceAction211(5),
-                       new ReduceAction212(5),
-                       new ReduceAction211(5),
-                       new ReduceAction214(5),
-                       new ReduceAction215(5),
-                       new ReduceAction214(5),
-                       new ReduceAction217(5),
-                       new ReduceAction218(5),
-                       new ReduceAction219(5),
-                       new ReduceAction220(5),
-                       new ReduceAction219(5),
-                       new ReduceAction222(5),
-                       new ReduceAction223(5),
-                       new ReduceAction222(5),
-                       new ReduceAction225(5),
-                       new ReduceAction226(5),
-                       new ReduceAction227(5),
-                       new ReduceAction228(5),
-                       new ReduceAction227(5),
-                       new ReduceAction230(5),
-                       new ReduceAction231(5),
-                       new ReduceAction230(5),
-                       new ReduceAction233(5),
-                       new ReduceAction234(5),
-                       new ReduceAction235(5),
-                       new ReduceAction236(5),
-                       new ReduceAction235(5),
-                       new ReduceAction238(5),
-                       new ReduceAction239(5),
-                       new ReduceAction238(5),
-                       new ReduceAction241(5),
-                       new ReduceAction242(5),
-                       new ReduceAction243(5),
-                       new ReduceAction244(5),
-                       new ReduceAction243(5),
-                       new ReduceAction246(5),
-                       new ReduceAction247(5),
-                       new ReduceAction246(5),
-                       new ReduceAction249(5),
-                       new ReduceAction250(5),
-                       new ReduceAction251(5),
-                       new ReduceAction252(5),
-                       new ReduceAction251(5),
-                       new ReduceAction254(5),
-                       new ReduceAction255(5),
-                       new ReduceAction254(5),
-                       new ReduceAction257(5),
-                       new ReduceAction258(5),
-                       new ReduceAction259(5),
-                       new ReduceAction260(5),
-                       new ReduceAction259(5),
-                       new ReduceAction262(5),
-                       new ReduceAction263(5),
-                       new ReduceAction262(5),
-                       new ReduceAction265(5),
-                       new ReduceAction266(5),
-                       new ReduceAction267(5),
-                       new ReduceAction268(5),
-                       new ReduceAction267(5),
-                       new ReduceAction270(5),
-                       new ReduceAction271(5),
-                       new ReduceAction270(5),
-                       new ReduceAction273(5),
-                       new ReduceAction274(5),
-                       new ReduceAction275(5),
-                       new ReduceAction276(5),
-                       new ReduceAction275(5),
-                       new ReduceAction278(5),
-                       new ReduceAction279(5),
-                       new ReduceAction278(5),
-                       new ReduceAction281(5),
-                       new ReduceAction282(5),
-                       new ReduceAction283(5),
-                       new ReduceAction284(5),
-                       new ReduceAction283(5),
-                       new ReduceAction286(5),
-                       new ReduceAction287(5),
-                       new ReduceAction286(5),
-                       new ReduceAction289(5),
-                       new ReduceAction290(5),
-                       new ReduceAction291(5),
-                       new ReduceAction292(5),
-                       new ReduceAction291(5),
-                       new ReduceAction294(5),
-                       new ReduceAction295(5),
-                       new ReduceAction294(5),
-                       new ReduceAction297(5),
-                       new ReduceAction298(5),
-                       new ReduceAction299(5),
-                       new ReduceAction300(5),
-                       new ReduceAction299(5),
-                       new ReduceAction302(5),
-                       new ReduceAction303(5),
-                       new ReduceAction302(5),
-                       new ReduceAction305(5),
-                       new ReduceAction306(5),
-                       new ReduceAction307(5),
-                       new ReduceAction308(5),
-                       new ReduceAction307(5),
-                       new ReduceAction310(5),
-                       new ReduceAction311(5),
-                       new ReduceAction310(5),
-                       new ReduceAction313(5),
-                       new ReduceAction314(5),
-                       new ReduceAction315(5),
-                       new ReduceAction316(5),
-                       new ReduceAction315(5),
-                       new ReduceAction318(5),
-                       new ReduceAction319(5),
-                       new ReduceAction318(5),
-                       new ReduceAction321(5),
-                       new ReduceAction322(5),
-                       new ReduceAction323(5),
-                       new ReduceAction324(5),
-                       new ReduceAction323(5),
-                       new ReduceAction326(5),
-                       new ReduceAction327(5),
-                       new ReduceAction326(5),
-                       new ReduceAction329(6),
-                       new ReduceAction330(6),
-                       new ReduceAction331(6),
-                       new ReduceAction332(6),
-                       new ReduceAction333(6),
-                       new ReduceAction334(6),
-                       new ReduceAction335(7),
-                       new ReduceAction336(7),
-                       new ReduceAction337(8),
-                       new ReduceAction338(9),
-                       new ReduceAction339(9),
-                       new ReduceAction340(9),
-                       new ReduceAction341(9),
-                       new ReduceAction342(10),
-                       new ReduceAction343(10),
-                       new ReduceAction344(11),
-                       new ReduceAction345(12),
-                       new ReduceAction346(12),
-                       new ReduceAction347(12),
-                       new ReduceAction348(12),
-                       new ReduceAction349(12),
-                       new ReduceAction350(12),
-                       new ReduceAction351(12),
-                       new ReduceAction352(12),
-                       new ReduceAction353(12),
-                       new ReduceAction354(12),
-                       new ReduceAction355(12),
-                       new ReduceAction356(12),
-                       new ReduceAction357(12),
-                       new ReduceAction358(12),
-                       new ReduceAction359(12),
-                       new ReduceAction360(12),
-                       new ReduceAction361(12),
-                       new ReduceAction362(12),
-                       new ReduceAction363(12),
-                       new ReduceAction364(12),
-                       new ReduceAction365(12),
-                       new ReduceAction366(12),
-                       new ReduceAction367(12),
-                       new ReduceAction368(12),
-                       new ReduceAction369(12),
-                       new ReduceAction370(12),
-                       new ReduceAction371(12),
-                       new ReduceAction372(12),
-                       new ReduceAction373(12),
-                       new ReduceAction374(12),
-                       new ReduceAction375(12),
-                       new ReduceAction376(12),
-                       new ReduceAction377(12),
-                       new ReduceAction378(12),
-                       new ReduceAction379(12),
-                       new ReduceAction380(12),
-                       new ReduceAction381(12),
-                       new ReduceAction382(12),
-                       new ReduceAction383(12),
-                       new ReduceAction384(12),
-                       new ReduceAction385(12),
-                       new ReduceAction386(12),
-                       new ReduceAction387(12),
-                       new ReduceAction388(12),
-                       new ReduceAction389(12),
-                       new ReduceAction390(12),
-                       new ReduceAction391(12),
-                       new ReduceAction392(12),
-                       new ReduceAction393(12),
-                       new ReduceAction394(12),
-                       new ReduceAction395(12),
-                       new ReduceAction396(12),
-                       new ReduceAction397(12),
-                       new ReduceAction398(12),
-                       new ReduceAction399(12),
-                       new ReduceAction400(12),
-                       new ReduceAction401(12),
-                       new ReduceAction402(12),
-                       new ReduceAction403(12),
-                       new ReduceAction404(12),
-                       new ReduceAction405(12),
-                       new ReduceAction406(12),
-                       new ReduceAction407(12),
-                       new ReduceAction408(12),
-                       new ReduceAction409(12),
-                       new ReduceAction410(12),
-                       new ReduceAction411(12),
-                       new ReduceAction412(12),
-                       new ReduceAction413(12),
-                       new ReduceAction414(12),
-                       new ReduceAction415(12),
-                       new ReduceAction416(12),
-                       new ReduceAction417(12),
-                       new ReduceAction418(12),
-                       new ReduceAction419(12),
-                       new ReduceAction420(12),
-                       new ReduceAction421(12),
-                       new ReduceAction422(12),
-                       new ReduceAction423(12),
-                       new ReduceAction424(12),
-                       new ReduceAction425(12),
-                       new ReduceAction426(12),
-                       new ReduceAction427(12),
-                       new ReduceAction428(12),
-                       new ReduceAction429(12),
-                       new ReduceAction430(12),
-                       new ReduceAction431(12),
-                       new ReduceAction432(12),
-                       new ReduceAction433(12),
-                       new ReduceAction434(12),
-                       new ReduceAction435(12),
-                       new ReduceAction436(12),
-                       new ReduceAction437(12),
-                       new ReduceAction438(12),
-                       new ReduceAction439(12),
-                       new ReduceAction440(12),
-                       new ReduceAction441(12),
-                       new ReduceAction442(12),
-                       new ReduceAction443(12),
-                       new ReduceAction444(12),
-                       new ReduceAction445(12),
-                       new ReduceAction446(12),
-                       new ReduceAction447(12),
-                       new ReduceAction448(12),
-                       new ReduceAction449(12),
-                       new ReduceAction450(12),
-                       new ReduceAction451(12),
-                       new ReduceAction452(12),
-                       new ReduceAction453(12),
-                       new ReduceAction454(12),
-                       new ReduceAction455(12),
-                       new ReduceAction456(12),
-                       new ReduceAction457(12),
-                       new ReduceAction458(12),
-                       new ReduceAction459(12),
-                       new ReduceAction460(12),
-                       new ReduceAction461(12),
-                       new ReduceAction462(12),
-                       new ReduceAction463(12),
-                       new ReduceAction464(12),
-                       new ReduceAction465(12),
-                       new ReduceAction466(12),
-                       new ReduceAction467(12),
-                       new ReduceAction468(12),
-                       new ReduceAction469(12),
-                       new ReduceAction470(12),
-                       new ReduceAction471(12),
-                       new ReduceAction472(12),
-                       new ReduceAction473(12),
-                       new ReduceAction474(12),
-                       new ReduceAction475(12),
-                       new ReduceAction476(12),
-                       new ReduceAction477(12),
-                       new ReduceAction478(12),
-                       new ReduceAction479(12),
-                       new ReduceAction480(12),
-                       new ReduceAction481(12),
-                       new ReduceAction482(12),
-                       new ReduceAction483(12),
-                       new ReduceAction484(12),
-                       new ReduceAction485(12),
-                       new ReduceAction486(12),
-                       new ReduceAction487(12),
-                       new ReduceAction488(12),
-                       new ReduceAction489(12),
-                       new ReduceAction490(12),
-                       new ReduceAction491(12),
-                       new ReduceAction492(12),
-                       new ReduceAction493(12),
-                       new ReduceAction494(12),
-                       new ReduceAction495(12),
-                       new ReduceAction496(12),
-                       new ReduceAction497(12),
-                       new ReduceAction498(12),
-                       new ReduceAction499(12),
-                       new ReduceAction500(12),
-                       new ReduceAction501(12),
-                       new ReduceAction502(12),
-                       new ReduceAction503(12),
-                       new ReduceAction504(12),
-                       new ReduceAction505(12),
-                       new ReduceAction506(12),
-                       new ReduceAction507(12),
-                       new ReduceAction508(12),
-                       new ReduceAction509(12),
-                       new ReduceAction510(12),
-                       new ReduceAction511(12),
-                       new ReduceAction512(12),
-                       new ReduceAction513(13),
-                       new ReduceAction514(13),
-                       new ReduceAction513(14),
-                       new ReduceAction516(14),
-                       new ReduceAction517(15),
-                       new ReduceAction518(15),
-                       new ReduceAction519(16),
-                       new ReduceAction520(16),
-                       new ReduceAction521(17),
-                       new ReduceAction522(17),
-                       new ReduceAction523(18),
-                       new ReduceAction524(18),
-                       new ReduceAction525(18),
-                       new ReduceAction526(18),
-                       new ReduceAction527(19),
-                       new ReduceAction528(19),
-                       new ReduceAction529(19),
-                       new ReduceAction530(19),
-                       new ReduceAction531(19),
-                       new ReduceAction532(19),
-                       new ReduceAction533(19),
-                       new ReduceAction534(19),
-                       new ReduceAction535(19),
-                       new ReduceAction536(19),
-                       new ReduceAction537(19),
-                       new ReduceAction538(19),
-                       new ReduceAction539(19),
-                       new ReduceAction540(19),
-                       new ReduceAction541(19),
-                       new ReduceAction542(19),
-                       new ReduceAction543(19),
-                       new ReduceAction544(19),
-                       new ReduceAction545(20),
-                       new ReduceAction546(20),
-                       new ReduceAction547(20),
-                       new ReduceAction548(20),
-                       new ReduceAction549(20),
-                       new ReduceAction550(20),
-                       new ReduceAction551(20),
-                       new ReduceAction552(20),
-                       new ReduceAction553(20),
-                       new ReduceAction554(20),
-                       new ReduceAction555(20),
-                       new ReduceAction556(20),
-                       new ReduceAction557(21),
-                       new ReduceAction558(21),
-                       new ReduceAction559(21),
-                       new ReduceAction560(21),
-                       new ReduceAction561(21),
-                       new ReduceAction562(21),
-                       new ReduceAction563(22),
-                       new ReduceAction564(22),
-                       new ReduceAction565(23),
-                       new ReduceAction566(24),
-                       new ReduceAction567(24),
-                       new ReduceAction568(24),
-                       new ReduceAction569(24),
-                       new ReduceAction570(24),
-                       new ReduceAction571(24),
-                       new ReduceAction572(25),
-                       new ReduceAction573(26),
-                       new ReduceAction574(26),
-                       new ReduceAction575(26),
-                       new ReduceAction576(26),
-                       new ReduceAction577(26),
-                       new ReduceAction578(26),
-                       new ReduceAction579(27),
-                       new ReduceAction580(28),
-                       new ReduceAction581(28),
-                       new ReduceAction582(29),
-                       new ReduceAction583(30),
-                       new ReduceAction583(30),
-                       new ReduceAction585(30),
-                       new ReduceAction586(31),
-                       new ReduceAction587(31),
-                       new ReduceAction588(31),
-                       new ReduceAction589(32),
-                       new ReduceAction590(32),
-                       new ReduceAction591(32),
-                       new ReduceAction592(33),
-                       new ReduceAction593(34),
-                       new ReduceAction594(34),
-                       new ReduceAction595(35),
-                       new ReduceAction596(36),
-                       new ReduceAction597(36),
-                       new ReduceAction598(36),
-                       new ReduceAction599(36),
-                       new ReduceAction600(36),
-                       new ReduceAction601(36),
-                       new ReduceAction602(36),
-                       new ReduceAction603(36),
-                       new ReduceAction604(37),
-                       new ReduceAction605(37),
-                       new ReduceAction606(38),
-                       new ReduceAction606(39),
-                       new ReduceAction608(40),
-                       new ReduceAction609(40),
-                       new ReduceAction610(40),
-                       new ReduceAction611(40),
-                       new ReduceAction612(41),
-                       new ReduceAction613(41),
-                       new ReduceAction614(42),
-                       new ReduceAction615(42),
-                       new ReduceAction616(43),
-                       new ReduceAction617(43),
-                       new ReduceAction608(44),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction621(45),
-                       new ReduceAction622(45),
-                       new ReduceAction623(45),
-                       new ReduceAction624(45),
-                       new ReduceAction625(45),
-                       new ReduceAction626(45),
-                       new ReduceAction627(45),
-                       new ReduceAction628(45),
-                       new ReduceAction629(45),
-                       new ReduceAction630(45),
-                       new ReduceAction631(45),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction611(45),
-                       new ReduceAction638(45),
-                       new ReduceAction639(45),
-                       new ReduceAction640(45),
-                       new ReduceAction641(45),
-                       new ReduceAction640(45),
-                       new ReduceAction643(45),
-                       new ReduceAction644(45),
-                       new ReduceAction643(45),
-                       new ReduceAction646(45),
-                       new ReduceAction647(45),
-                       new ReduceAction648(45),
-                       new ReduceAction649(45),
-                       new ReduceAction648(45),
-                       new ReduceAction651(45),
-                       new ReduceAction652(45),
-                       new ReduceAction651(45),
-                       new ReduceAction654(45),
-                       new ReduceAction655(45),
-                       new ReduceAction656(45),
-                       new ReduceAction657(45),
-                       new ReduceAction658(45),
-                       new ReduceAction659(45),
-                       new ReduceAction660(45),
-                       new ReduceAction661(45),
-                       new ReduceAction660(45),
-                       new ReduceAction663(45),
-                       new ReduceAction664(45),
-                       new ReduceAction663(45),
-                       new ReduceAction666(45),
-                       new ReduceAction667(46),
-                       new ReduceAction668(47),
-                       new ReduceAction669(47),
-                       new ReduceAction670(48),
-                       new ReduceAction671(48),
-                       new ReduceAction672(48),
-                       new ReduceAction673(48),
-                       new ReduceAction674(48),
-                       new ReduceAction675(48),
-                       new ReduceAction676(48),
-                       new ReduceAction677(48),
-                       new ReduceAction678(48),
-                       new ReduceAction679(49),
-                       new ReduceAction680(49),
-                       new ReduceAction681(49),
-                       new ReduceAction682(49),
-                       new ReduceAction683(49),
-                       new ReduceAction684(49),
-                       new ReduceAction685(50),
-                       new ReduceAction686(50),
-                       new ReduceAction687(51),
-                       new ReduceAction688(52),
-                       new ReduceAction689(52),
-                       new ReduceAction690(52),
-                       new ReduceAction691(52),
-                       new ReduceAction692(52),
-                       new ReduceAction693(52),
-                       new ReduceAction694(52),
-                       new ReduceAction695(52),
-                       new ReduceAction696(53),
-                       new ReduceAction697(53),
-                       new ReduceAction698(53),
-                       new ReduceAction699(53),
-                       new ReduceAction698(53),
-                       new ReduceAction701(53),
-                       new ReduceAction702(53),
-                       new ReduceAction701(53),
-                       new ReduceAction704(53),
-                       new ReduceAction705(53),
-                       new ReduceAction706(53),
-                       new ReduceAction707(53),
-                       new ReduceAction706(53),
-                       new ReduceAction709(53),
-                       new ReduceAction710(53),
-                       new ReduceAction709(53),
-                       new ReduceAction712(53),
-                       new ReduceAction713(53),
-                       new ReduceAction714(53),
-                       new ReduceAction715(53),
-                       new ReduceAction716(53),
-                       new ReduceAction715(53),
-                       new ReduceAction718(53),
-                       new ReduceAction719(53),
-                       new ReduceAction718(53),
-                       new ReduceAction721(53),
-                       new ReduceAction722(53),
-                       new ReduceAction723(53),
-                       new ReduceAction724(53),
-                       new ReduceAction723(53),
-                       new ReduceAction726(53),
-                       new ReduceAction727(53),
-                       new ReduceAction726(53),
-                       new ReduceAction729(53),
-                       new ReduceAction730(54),
-                       new ReduceAction731(54),
-                       new ReduceAction732(55),
-                       new ReduceAction733(55),
-                       new ReduceAction734(56),
-                       new ReduceAction735(56),
-                       new ReduceAction736(56),
-                       new ReduceAction737(56),
-                       new ReduceAction738(56),
-                       new ReduceAction608(57),
-                       new ReduceAction610(57),
-                       new ReduceAction741(58),
-                       new ReduceAction742(58),
-                       new ReduceAction743(59),
-                       new ReduceAction744(59),
-                       new ReduceAction745(60),
-                       new ReduceAction746(60),
-                       new ReduceAction747(60),
-                       new ReduceAction748(60),
-                       new ReduceAction749(61),
-                       new ReduceAction750(61),
-                       new ReduceAction751(61),
-                       new ReduceAction752(61),
-                       new ReduceAction753(62),
-                       new ReduceAction611(63),
-                       new ReduceAction646(63),
-                       new ReduceAction647(63),
-                       new ReduceAction648(63),
-                       new ReduceAction649(63),
-                       new ReduceAction648(63),
-                       new ReduceAction651(63),
-                       new ReduceAction652(63),
-                       new ReduceAction651(63),
-                       new ReduceAction763(63),
-                       new ReduceAction611(64),
-                       new ReduceAction765(64),
-                       new ReduceAction611(65),
-                       new ReduceAction767(65),
-                       new ReduceAction768(65),
-                       new ReduceAction769(65),
-                       new ReduceAction611(66),
-                       new ReduceAction771(66),
-                       new ReduceAction611(67),
-                       new ReduceAction773(67),
-                       new ReduceAction774(67),
-                       new ReduceAction775(67),
-                       new ReduceAction776(67),
-                       new ReduceAction777(67),
-                       new ReduceAction778(67),
-                       new ReduceAction779(67),
-                       new ReduceAction780(67),
-                       new ReduceAction781(67),
-                       new ReduceAction782(67),
-                       new ReduceAction783(67),
-                       new ReduceAction611(68),
-                       new ReduceAction785(68),
-                       new ReduceAction786(68),
-                       new ReduceAction611(69),
-                       new ReduceAction788(69),
-                       new ReduceAction789(69),
-                       new ReduceAction790(69),
-                       new ReduceAction611(70),
-                       new ReduceAction792(70),
-                       new ReduceAction793(70),
-                       new ReduceAction611(71),
-                       new ReduceAction795(71),
-                       new ReduceAction796(71),
-                       new ReduceAction797(71),
-                       new ReduceAction798(71),
-                       new ReduceAction799(71),
-                       new ReduceAction798(71),
-                       new ReduceAction801(71),
-                       new ReduceAction802(71),
-                       new ReduceAction801(71),
-                       new ReduceAction804(72),
-                       new ReduceAction805(72),
-                       new ReduceAction806(72),
-                       new ReduceAction807(72),
-                       new ReduceAction806(72),
-                       new ReduceAction809(72),
-                       new ReduceAction810(72),
-                       new ReduceAction809(72),
-                       new ReduceAction638(72),
-                       new ReduceAction639(72),
-                       new ReduceAction640(72),
-                       new ReduceAction641(72),
-                       new ReduceAction640(72),
-                       new ReduceAction643(72),
-                       new ReduceAction644(72),
-                       new ReduceAction643(72),
-                       new ReduceAction654(72),
-                       new ReduceAction655(72),
-                       new ReduceAction656(72),
-                       new ReduceAction657(72),
-                       new ReduceAction658(72),
-                       new ReduceAction659(72),
-                       new ReduceAction826(72),
-                       new ReduceAction827(72),
-                       new ReduceAction828(72),
-                       new ReduceAction829(72),
-                       new ReduceAction828(72),
-                       new ReduceAction831(72),
-                       new ReduceAction832(72),
-                       new ReduceAction833(72),
-                       new ReduceAction834(72),
-                       new ReduceAction835(72),
-                       new ReduceAction836(72),
-                       new ReduceAction837(72),
-                       new ReduceAction838(72),
-                       new ReduceAction839(72),
-                       new ReduceAction840(72),
-                       new ReduceAction841(72),
-                       new ReduceAction842(72),
-                       new ReduceAction843(72),
-                       new ReduceAction844(72),
-                       new ReduceAction845(72),
-                       new ReduceAction846(72),
-                       new ReduceAction847(72),
-                       new ReduceAction848(72),
-                       new ReduceAction849(72),
-                       new ReduceAction850(72),
-                       new ReduceAction851(72),
-                       new ReduceAction852(72),
-                       new ReduceAction611(72),
-                       new ReduceAction854(72),
-                       new ReduceAction855(72),
-                       new ReduceAction856(72),
-                       new ReduceAction857(72),
-                       new ReduceAction858(73),
-                       new ReduceAction859(73),
-                       new ReduceAction860(73),
-                       new ReduceAction861(73),
-                       new ReduceAction862(74),
-                       new ReduceAction863(75),
-                       new ReduceAction862(76),
-                       new ReduceAction865(77),
-                       new ReduceAction866(78),
-                       new ReduceAction867(79),
-                       new ReduceAction868(79),
-                       new ReduceAction869(80),
-                       new ReduceAction870(80),
-                       new ReduceAction871(80),
-                       new ReduceAction872(80),
-                       new ReduceAction873(81),
-                       new ReduceAction874(82),
-                       new ReduceAction875(82),
-                       new ReduceAction873(83),
-                       new ReduceAction877(84),
-                       new ReduceAction878(84),
-                       new ReduceAction879(84),
-                       new ReduceAction880(84),
-                       new ReduceAction881(84),
-                       new ReduceAction882(85),
-                       new ReduceAction883(86),
-                       new ReduceAction884(86),
-                       new ReduceAction885(87),
-                       new ReduceAction886(88),
-                       new ReduceAction887(88),
-                       new ReduceAction887(88),
-                       new ReduceAction889(88),
-                       new ReduceAction890(89),
-                       new ReduceAction891(89),
-                       new ReduceAction892(89),
-                       new ReduceAction891(89),
-                       new ReduceAction894(89),
-                       new ReduceAction895(89),
-                       new ReduceAction896(89),
-                       new ReduceAction895(89),
-                       new ReduceAction898(89),
-                       new ReduceAction899(89),
-                       new ReduceAction900(89),
-                       new ReduceAction899(89),
-                       new ReduceAction902(89),
-                       new ReduceAction903(89),
-                       new ReduceAction904(89),
-                       new ReduceAction903(89),
-                       new ReduceAction906(90),
-                       new ReduceAction907(90),
-                       new ReduceAction908(90),
-                       new ReduceAction906(91),
-                       new ReduceAction910(91),
-                       new ReduceAction907(91),
-                       new ReduceAction908(91),
-                       new ReduceAction913(92),
-                       new ReduceAction914(93),
-                       new ReduceAction915(93),
-                       new ReduceAction916(94),
-                       new ReduceAction917(95),
-                       new ReduceAction918(95),
-                       new ReduceAction919(96),
-                       new ReduceAction920(96),
-                       new ReduceAction921(96),
-                       new ReduceAction922(96),
-                       new ReduceAction923(97),
-                       new ReduceAction924(98),
-                       new ReduceAction925(99),
-                       new ReduceAction925(99),
-                       new ReduceAction927(100),
-                       new ReduceAction928(100),
-                       new ReduceAction70(100),
-                       new ReduceAction930(101),
-                       new ReduceAction931(101),
-                       new ReduceAction932(102),
-                       new ReduceAction933(102),
-                       new ReduceAction925(102),
-                       new ReduceAction344(103),
-                       new ReduceAction345(104),
-                       new ReduceAction346(104),
-                       new ReduceAction347(104),
-                       new ReduceAction348(104),
-                       new ReduceAction349(104),
-                       new ReduceAction350(104),
-                       new ReduceAction351(104),
-                       new ReduceAction352(104),
-                       new ReduceAction353(104),
-                       new ReduceAction354(104),
-                       new ReduceAction355(104),
-                       new ReduceAction356(104),
-                       new ReduceAction361(104),
-                       new ReduceAction362(104),
-                       new ReduceAction363(104),
-                       new ReduceAction364(104),
-                       new ReduceAction365(104),
-                       new ReduceAction366(104),
-                       new ReduceAction367(104),
-                       new ReduceAction368(104),
-                       new ReduceAction369(104),
-                       new ReduceAction370(104),
-                       new ReduceAction371(104),
-                       new ReduceAction372(104),
-                       new ReduceAction373(104),
-                       new ReduceAction374(104),
-                       new ReduceAction375(104),
-                       new ReduceAction376(104),
-                       new ReduceAction377(104),
-                       new ReduceAction378(104),
-                       new ReduceAction379(104),
-                       new ReduceAction380(104),
-                       new ReduceAction545(105),
-                       new ReduceAction546(105),
-                       new ReduceAction547(105),
-                       new ReduceAction548(105),
-                       new ReduceAction553(105),
-                       new ReduceAction554(105),
-                       new ReduceAction596(106),
-                       new ReduceAction597(106),
-                       new ReduceAction598(106),
-                       new ReduceAction599(106),
-                       new ReduceAction611(107),
-                       new ReduceAction646(107),
-                       new ReduceAction647(107),
-                       new ReduceAction648(107),
-                       new ReduceAction651(107),
-                       new ReduceAction649(107),
-                       new ReduceAction652(107),
-                       new ReduceAction648(107),
-                       new ReduceAction651(107),
-                       new ReduceAction611(108),
-                       new ReduceAction765(108),
-                       new ReduceAction611(109),
-                       new ReduceAction767(109),
-                       new ReduceAction768(109),
-                       new ReduceAction769(109),
-                       new ReduceAction611(110),
-                       new ReduceAction771(110),
-                       new ReduceAction611(111),
-                       new ReduceAction773(111),
-                       new ReduceAction774(111),
-                       new ReduceAction775(111),
-                       new ReduceAction776(111),
-                       new ReduceAction777(111),
-                       new ReduceAction778(111),
-                       new ReduceAction779(111),
-                       new ReduceAction780(111),
-                       new ReduceAction781(111),
-                       new ReduceAction782(111),
-                       new ReduceAction783(111),
-                       new ReduceAction611(112),
-                       new ReduceAction785(112),
-                       new ReduceAction786(112),
-                       new ReduceAction611(113),
-                       new ReduceAction788(113),
-                       new ReduceAction789(113),
-                       new ReduceAction790(113),
-                       new ReduceAction611(114),
-                       new ReduceAction792(114),
-                       new ReduceAction793(114),
-                       new ReduceAction611(115),
-                       new ReduceAction795(115),
-                       new ReduceAction796(115),
-                       new ReduceAction797(115),
-                       new ReduceAction798(115),
-                       new ReduceAction801(115),
-                       new ReduceAction799(115),
-                       new ReduceAction802(115),
-                       new ReduceAction798(115),
-                       new ReduceAction801(115),
-                       new ReduceAction804(116),
-                       new ReduceAction805(116),
-                       new ReduceAction806(116),
-                       new ReduceAction809(116),
-                       new ReduceAction807(116),
-                       new ReduceAction810(116),
-                       new ReduceAction806(116),
-                       new ReduceAction809(116),
-                       new ReduceAction638(116),
-                       new ReduceAction639(116),
-                       new ReduceAction640(116),
-                       new ReduceAction643(116),
-                       new ReduceAction641(116),
-                       new ReduceAction644(116),
-                       new ReduceAction640(116),
-                       new ReduceAction643(116),
-                       new ReduceAction654(116),
-                       new ReduceAction655(116),
-                       new ReduceAction656(116),
-                       new ReduceAction657(116),
-                       new ReduceAction658(116),
-                       new ReduceAction659(116),
-                       new ReduceAction827(116),
-                       new ReduceAction828(116),
-                       new ReduceAction829(116),
-                       new ReduceAction828(116),
-                       new ReduceAction837(116),
-                       new ReduceAction838(116),
-                       new ReduceAction839(116),
-                       new ReduceAction840(116),
-                       new ReduceAction841(116),
-                       new ReduceAction842(116),
-                       new ReduceAction843(116),
-                       new ReduceAction844(116),
-                       new ReduceAction845(116),
-                       new ReduceAction846(116),
-                       new ReduceAction847(116),
-                       new ReduceAction848(116),
-                       new ReduceAction849(116),
-                       new ReduceAction850(116),
-                       new ReduceAction851(116),
-                       new ReduceAction852(116),
-                       new ReduceAction611(116),
-                       new ReduceAction854(116),
-                       new ReduceAction855(116),
-                       new ReduceAction856(116),
-                       new ReduceAction857(116),
-                       new ReduceAction596(117),
-                       new ReduceAction597(117),
-                       new ReduceAction598(117),
-                       new ReduceAction599(117),
-                       new ReduceAction600(117),
-                       new ReduceAction601(117),
-                       new ReduceAction602(117),
-                       new ReduceAction603(117),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction621(118),
-                       new ReduceAction622(118),
-                       new ReduceAction623(118),
-                       new ReduceAction624(118),
-                       new ReduceAction625(118),
-                       new ReduceAction626(118),
-                       new ReduceAction627(118),
-                       new ReduceAction628(118),
-                       new ReduceAction629(118),
-                       new ReduceAction630(118),
-                       new ReduceAction631(118),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction611(118),
-                       new ReduceAction638(118),
-                       new ReduceAction639(118),
-                       new ReduceAction640(118),
-                       new ReduceAction641(118),
-                       new ReduceAction640(118),
-                       new ReduceAction643(118),
-                       new ReduceAction644(118),
-                       new ReduceAction643(118),
-                       new ReduceAction646(118),
-                       new ReduceAction647(118),
-                       new ReduceAction648(118),
-                       new ReduceAction649(118),
-                       new ReduceAction648(118),
-                       new ReduceAction651(118),
-                       new ReduceAction652(118),
-                       new ReduceAction651(118),
-                       new ReduceAction654(118),
-                       new ReduceAction655(118),
-                       new ReduceAction656(118),
-                       new ReduceAction657(118),
-                       new ReduceAction658(118),
-                       new ReduceAction659(118),
-                       new ReduceAction660(118),
-                       new ReduceAction661(118),
-                       new ReduceAction660(118),
-                       new ReduceAction663(118),
-                       new ReduceAction664(118),
-                       new ReduceAction663(118),
-                       new ReduceAction666(118),
-                       new ReduceAction696(119),
-                       new ReduceAction697(119),
-                       new ReduceAction698(119),
-                       new ReduceAction699(119),
-                       new ReduceAction698(119),
-                       new ReduceAction701(119),
-                       new ReduceAction702(119),
-                       new ReduceAction701(119),
-                       new ReduceAction704(119),
-                       new ReduceAction705(119),
-                       new ReduceAction706(119),
-                       new ReduceAction707(119),
-                       new ReduceAction706(119),
-                       new ReduceAction709(119),
-                       new ReduceAction710(119),
-                       new ReduceAction709(119),
-                       new ReduceAction712(119),
-                       new ReduceAction713(119),
-                       new ReduceAction714(119),
-                       new ReduceAction715(119),
-                       new ReduceAction716(119),
-                       new ReduceAction715(119),
-                       new ReduceAction718(119),
-                       new ReduceAction719(119),
-                       new ReduceAction718(119),
-                       new ReduceAction721(119),
-                       new ReduceAction722(119),
-                       new ReduceAction723(119),
-                       new ReduceAction724(119),
-                       new ReduceAction723(119),
-                       new ReduceAction726(119),
-                       new ReduceAction727(119),
-                       new ReduceAction726(119),
-                       new ReduceAction729(119),
-                       new ReduceAction611(120),
-                       new ReduceAction646(120),
-                       new ReduceAction647(120),
-                       new ReduceAction648(120),
-                       new ReduceAction649(120),
-                       new ReduceAction648(120),
-                       new ReduceAction651(120),
-                       new ReduceAction652(120),
-                       new ReduceAction651(120),
-                       new ReduceAction611(121),
-                       new ReduceAction765(121),
-                       new ReduceAction611(122),
-                       new ReduceAction767(122),
-                       new ReduceAction768(122),
-                       new ReduceAction769(122),
-                       new ReduceAction611(123),
-                       new ReduceAction771(123),
-                       new ReduceAction611(124),
-                       new ReduceAction773(124),
-                       new ReduceAction774(124),
-                       new ReduceAction775(124),
-                       new ReduceAction776(124),
-                       new ReduceAction777(124),
-                       new ReduceAction778(124),
-                       new ReduceAction779(124),
-                       new ReduceAction780(124),
-                       new ReduceAction781(124),
-                       new ReduceAction782(124),
-                       new ReduceAction783(124),
-                       new ReduceAction611(125),
-                       new ReduceAction785(125),
-                       new ReduceAction786(125),
-                       new ReduceAction611(126),
-                       new ReduceAction788(126),
-                       new ReduceAction789(126),
-                       new ReduceAction790(126),
-                       new ReduceAction611(127),
-                       new ReduceAction792(127),
-                       new ReduceAction793(127),
-                       new ReduceAction611(128),
-                       new ReduceAction795(128),
-                       new ReduceAction796(128),
-                       new ReduceAction797(128),
-                       new ReduceAction798(128),
-                       new ReduceAction799(128),
-                       new ReduceAction798(128),
-                       new ReduceAction801(128),
-                       new ReduceAction802(128),
-                       new ReduceAction801(128),
-                       new ReduceAction804(129),
-                       new ReduceAction805(129),
-                       new ReduceAction806(129),
-                       new ReduceAction807(129),
-                       new ReduceAction806(129),
-                       new ReduceAction809(129),
-                       new ReduceAction810(129),
-                       new ReduceAction809(129),
-                       new ReduceAction638(129),
-                       new ReduceAction639(129),
-                       new ReduceAction640(129),
-                       new ReduceAction641(129),
-                       new ReduceAction640(129),
-                       new ReduceAction643(129),
-                       new ReduceAction644(129),
-                       new ReduceAction643(129),
-                       new ReduceAction654(129),
-                       new ReduceAction655(129),
-                       new ReduceAction656(129),
-                       new ReduceAction657(129),
-                       new ReduceAction658(129),
-                       new ReduceAction659(129),
-                       new ReduceAction826(129),
-                       new ReduceAction827(129),
-                       new ReduceAction828(129),
-                       new ReduceAction829(129),
-                       new ReduceAction828(129),
-                       new ReduceAction837(129),
-                       new ReduceAction838(129),
-                       new ReduceAction839(129),
-                       new ReduceAction840(129),
-                       new ReduceAction841(129),
-                       new ReduceAction842(129),
-                       new ReduceAction843(129),
-                       new ReduceAction844(129),
-                       new ReduceAction845(129),
-                       new ReduceAction846(129),
-                       new ReduceAction847(129),
-                       new ReduceAction848(129),
-                       new ReduceAction849(129),
-                       new ReduceAction850(129),
-                       new ReduceAction851(129),
-                       new ReduceAction852(129),
-                       new ReduceAction611(129),
-                       new ReduceAction856(129),
-                       new ReduceAction857(129),
-                       new ReduceAction867(130),
-                       new ReduceAction868(130),
-                       new ReduceAction869(131),
-                       new ReduceAction870(131),
-                       new ReduceAction883(132),
-                       new ReduceAction884(132),
-                       new ReduceAction886(133),
-                       new ReduceAction887(133),
-                       new ReduceAction887(133),
-                       new ReduceAction596(134),
-                       new ReduceAction597(134),
-                       new ReduceAction598(134),
-                       new ReduceAction599(134),
-                       new ReduceAction611(135),
-                       new ReduceAction646(135),
-                       new ReduceAction647(135),
-                       new ReduceAction648(135),
-                       new ReduceAction651(135),
-                       new ReduceAction649(135),
-                       new ReduceAction652(135),
-                       new ReduceAction648(135),
-                       new ReduceAction651(135),
-                       new ReduceAction611(136),
-                       new ReduceAction765(136),
-                       new ReduceAction611(137),
-                       new ReduceAction767(137),
-                       new ReduceAction768(137),
-                       new ReduceAction769(137),
-                       new ReduceAction611(138),
-                       new ReduceAction771(138),
-                       new ReduceAction611(139),
-                       new ReduceAction773(139),
-                       new ReduceAction774(139),
-                       new ReduceAction775(139),
-                       new ReduceAction776(139),
-                       new ReduceAction777(139),
-                       new ReduceAction778(139),
-                       new ReduceAction779(139),
-                       new ReduceAction780(139),
-                       new ReduceAction781(139),
-                       new ReduceAction782(139),
-                       new ReduceAction783(139),
-                       new ReduceAction611(140),
-                       new ReduceAction785(140),
-                       new ReduceAction786(140),
-                       new ReduceAction611(141),
-                       new ReduceAction788(141),
-                       new ReduceAction789(141),
-                       new ReduceAction790(141),
-                       new ReduceAction611(142),
-                       new ReduceAction792(142),
-                       new ReduceAction793(142),
-                       new ReduceAction611(143),
-                       new ReduceAction795(143),
-                       new ReduceAction1313(143),
-                       new ReduceAction1314(143),
-                       new ReduceAction796(143),
-                       new ReduceAction1314(143),
-                       new ReduceAction1317(144),
-                       new ReduceAction1318(144),
-                       new ReduceAction804(144),
-                       new ReduceAction1318(144),
-                       new ReduceAction1321(144),
-                       new ReduceAction1322(144),
-                       new ReduceAction638(144),
-                       new ReduceAction1322(144),
-                       new ReduceAction654(144),
-                       new ReduceAction655(144),
-                       new ReduceAction656(144),
-                       new ReduceAction657(144),
-                       new ReduceAction1329(144),
-                       new ReduceAction827(144),
-                       new ReduceAction828(144),
-                       new ReduceAction829(144),
-                       new ReduceAction828(144),
-                       new ReduceAction837(144),
-                       new ReduceAction838(144),
-                       new ReduceAction839(144),
-                       new ReduceAction840(144),
-                       new ReduceAction841(144),
-                       new ReduceAction842(144),
-                       new ReduceAction843(144),
-                       new ReduceAction844(144),
-                       new ReduceAction845(144),
-                       new ReduceAction846(144),
-                       new ReduceAction847(144),
-                       new ReduceAction848(144),
-                       new ReduceAction849(144),
-                       new ReduceAction850(144),
-                       new ReduceAction851(144),
-                       new ReduceAction852(144),
-                       new ReduceAction611(144),
-                       new ReduceAction856(144),
-                       new ReduceAction857(144),
-                       new ReduceAction1353(145),
-                       new ReduceAction1354(145),
-                       new ReduceAction608(146),
-                       new ReduceAction609(146),
-                       new ReduceAction610(146),
-                       new ReduceAction611(146),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction621(147),
-                       new ReduceAction622(147),
-                       new ReduceAction623(147),
-                       new ReduceAction624(147),
-                       new ReduceAction625(147),
-                       new ReduceAction626(147),
-                       new ReduceAction627(147),
-                       new ReduceAction628(147),
-                       new ReduceAction629(147),
-                       new ReduceAction630(147),
-                       new ReduceAction631(147),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction611(147),
-                       new ReduceAction638(147),
-                       new ReduceAction639(147),
-                       new ReduceAction640(147),
-                       new ReduceAction641(147),
-                       new ReduceAction640(147),
-                       new ReduceAction643(147),
-                       new ReduceAction644(147),
-                       new ReduceAction643(147),
-                       new ReduceAction646(147),
-                       new ReduceAction647(147),
-                       new ReduceAction648(147),
-                       new ReduceAction649(147),
-                       new ReduceAction648(147),
-                       new ReduceAction651(147),
-                       new ReduceAction652(147),
-                       new ReduceAction651(147),
-                       new ReduceAction654(147),
-                       new ReduceAction655(147),
-                       new ReduceAction656(147),
-                       new ReduceAction657(147),
-                       new ReduceAction658(147),
-                       new ReduceAction659(147),
-                       new ReduceAction660(147),
-                       new ReduceAction661(147),
-                       new ReduceAction660(147),
-                       new ReduceAction663(147),
-                       new ReduceAction664(147),
-                       new ReduceAction663(147),
-                       new ReduceAction666(147),
-                       new ReduceAction668(148),
-                       new ReduceAction669(148),
-                       new ReduceAction670(149),
-                       new ReduceAction671(149),
-                       new ReduceAction672(149),
-                       new ReduceAction673(149),
-                       new ReduceAction674(149),
-                       new ReduceAction675(149),
-                       new ReduceAction676(149),
-                       new ReduceAction677(149),
-                       new ReduceAction678(149),
-                       new ReduceAction687(150),
-                       new ReduceAction688(151),
-                       new ReduceAction689(151),
-                       new ReduceAction690(151),
-                       new ReduceAction691(151),
-                       new ReduceAction692(151),
-                       new ReduceAction693(151),
-                       new ReduceAction694(151),
-                       new ReduceAction695(151),
-                       new ReduceAction696(152),
-                       new ReduceAction697(152),
-                       new ReduceAction698(152),
-                       new ReduceAction699(152),
-                       new ReduceAction698(152),
-                       new ReduceAction701(152),
-                       new ReduceAction702(152),
-                       new ReduceAction701(152),
-                       new ReduceAction704(152),
-                       new ReduceAction705(152),
-                       new ReduceAction706(152),
-                       new ReduceAction707(152),
-                       new ReduceAction706(152),
-                       new ReduceAction709(152),
-                       new ReduceAction710(152),
-                       new ReduceAction709(152),
-                       new ReduceAction712(152),
-                       new ReduceAction713(152),
-                       new ReduceAction714(152),
-                       new ReduceAction715(152),
-                       new ReduceAction716(152),
-                       new ReduceAction715(152),
-                       new ReduceAction718(152),
-                       new ReduceAction719(152),
-                       new ReduceAction718(152),
-                       new ReduceAction721(152),
-                       new ReduceAction722(152),
-                       new ReduceAction723(152),
-                       new ReduceAction724(152),
-                       new ReduceAction723(152),
-                       new ReduceAction726(152),
-                       new ReduceAction727(152),
-                       new ReduceAction726(152),
-                       new ReduceAction729(152),
-                       new ReduceAction732(153),
-                       new ReduceAction733(153),
-                       new ReduceAction734(154),
-                       new ReduceAction741(155),
-                       new ReduceAction742(155),
-                       new ReduceAction743(156),
-                       new ReduceAction744(156),
-                       new ReduceAction745(157),
-                       new ReduceAction746(157),
-                       new ReduceAction747(157),
-                       new ReduceAction748(157),
-                       new ReduceAction749(158),
-                       new ReduceAction750(158),
-                       new ReduceAction611(159),
-                       new ReduceAction646(159),
-                       new ReduceAction647(159),
-                       new ReduceAction648(159),
-                       new ReduceAction649(159),
-                       new ReduceAction648(159),
-                       new ReduceAction651(159),
-                       new ReduceAction652(159),
-                       new ReduceAction651(159),
-                       new ReduceAction763(159),
-                       new ReduceAction611(160),
-                       new ReduceAction646(160),
-                       new ReduceAction647(160),
-                       new ReduceAction648(160),
-                       new ReduceAction651(160),
-                       new ReduceAction649(160),
-                       new ReduceAction652(160),
-                       new ReduceAction648(160),
-                       new ReduceAction651(160),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction621(161),
-                       new ReduceAction622(161),
-                       new ReduceAction623(161),
-                       new ReduceAction624(161),
-                       new ReduceAction625(161),
-                       new ReduceAction626(161),
-                       new ReduceAction627(161),
-                       new ReduceAction628(161),
-                       new ReduceAction629(161),
-                       new ReduceAction630(161),
-                       new ReduceAction631(161),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction611(161),
-                       new ReduceAction638(161),
-                       new ReduceAction639(161),
-                       new ReduceAction640(161),
-                       new ReduceAction641(161),
-                       new ReduceAction640(161),
-                       new ReduceAction643(161),
-                       new ReduceAction644(161),
-                       new ReduceAction643(161),
-                       new ReduceAction646(161),
-                       new ReduceAction647(161),
-                       new ReduceAction648(161),
-                       new ReduceAction649(161),
-                       new ReduceAction648(161),
-                       new ReduceAction651(161),
-                       new ReduceAction652(161),
-                       new ReduceAction651(161),
-                       new ReduceAction654(161),
-                       new ReduceAction655(161),
-                       new ReduceAction656(161),
-                       new ReduceAction657(161),
-                       new ReduceAction658(161),
-                       new ReduceAction659(161),
-                       new ReduceAction660(161),
-                       new ReduceAction661(161),
-                       new ReduceAction660(161),
-                       new ReduceAction663(161),
-                       new ReduceAction664(161),
-                       new ReduceAction663(161),
-                       new ReduceAction666(161),
-                       new ReduceAction696(162),
-                       new ReduceAction697(162),
-                       new ReduceAction698(162),
-                       new ReduceAction699(162),
-                       new ReduceAction698(162),
-                       new ReduceAction701(162),
-                       new ReduceAction702(162),
-                       new ReduceAction701(162),
-                       new ReduceAction704(162),
-                       new ReduceAction705(162),
-                       new ReduceAction706(162),
-                       new ReduceAction707(162),
-                       new ReduceAction706(162),
-                       new ReduceAction709(162),
-                       new ReduceAction710(162),
-                       new ReduceAction709(162),
-                       new ReduceAction712(162),
-                       new ReduceAction713(162),
-                       new ReduceAction714(162),
-                       new ReduceAction715(162),
-                       new ReduceAction716(162),
-                       new ReduceAction715(162),
-                       new ReduceAction718(162),
-                       new ReduceAction719(162),
-                       new ReduceAction718(162),
-                       new ReduceAction721(162),
-                       new ReduceAction722(162),
-                       new ReduceAction723(162),
-                       new ReduceAction724(162),
-                       new ReduceAction723(162),
-                       new ReduceAction726(162),
-                       new ReduceAction727(162),
-                       new ReduceAction726(162),
-                       new ReduceAction729(162),
-                       new ReduceAction611(163),
-                       new ReduceAction646(163),
-                       new ReduceAction647(163),
-                       new ReduceAction648(163),
-                       new ReduceAction649(163),
-                       new ReduceAction648(163),
-                       new ReduceAction651(163),
-                       new ReduceAction652(163),
-                       new ReduceAction651(163),
-                       new ReduceAction611(164),
-                       new ReduceAction646(164),
-                       new ReduceAction647(164),
-                       new ReduceAction648(164),
-                       new ReduceAction651(164),
-                       new ReduceAction649(164),
-                       new ReduceAction652(164),
-                       new ReduceAction648(164),
-                       new ReduceAction651(164),
-                       new ReduceAction608(165),
-                       new ReduceAction609(165),
-                       new ReduceAction610(165),
-                       new ReduceAction608(166),
-                       new ReduceAction609(166),
-                       new ReduceAction610(166),
-                       new ReduceAction611(167),
-                       new ReduceAction611(167),
-                       new ReduceAction621(167),
-                       new ReduceAction622(167),
-                       new ReduceAction623(167),
-                       new ReduceAction624(167),
-                       new ReduceAction625(167),
-                       new ReduceAction626(167),
-                       new ReduceAction627(167),
-                       new ReduceAction628(167),
-                       new ReduceAction629(167),
-                       new ReduceAction630(167),
-                       new ReduceAction631(167),
-                       new ReduceAction611(167),
-                       new ReduceAction611(167),
-                       new ReduceAction611(167),
-                       new ReduceAction611(167),
-                       new ReduceAction611(167),
-                       new ReduceAction666(167),
-                       new ReduceAction611(168),
-                       new ReduceAction611(168),
-                       new ReduceAction621(168),
-                       new ReduceAction622(168),
-                       new ReduceAction623(168),
-                       new ReduceAction624(168),
-                       new ReduceAction625(168),
-                       new ReduceAction626(168),
-                       new ReduceAction627(168),
-                       new ReduceAction628(168),
-                       new ReduceAction629(168),
-                       new ReduceAction630(168),
-                       new ReduceAction631(168),
-                       new ReduceAction611(168),
-                       new ReduceAction611(168),
-                       new ReduceAction611(168),
-                       new ReduceAction611(168),
-                       new ReduceAction611(168),
-                       new ReduceAction666(168),
-                       new ReduceAction611(169),
-                       new ReduceAction611(169),
-                       new ReduceAction621(169),
-                       new ReduceAction622(169),
-                       new ReduceAction623(169),
-                       new ReduceAction624(169),
-                       new ReduceAction625(169),
-                       new ReduceAction626(169),
-                       new ReduceAction627(169),
-                       new ReduceAction628(169),
-                       new ReduceAction629(169),
-                       new ReduceAction630(169),
-                       new ReduceAction631(169),
-                       new ReduceAction611(169),
-                       new ReduceAction611(169),
-                       new ReduceAction611(169),
-                       new ReduceAction611(169),
-                       new ReduceAction611(169),
-                       new ReduceAction666(169),
-                       new ReduceAction611(170),
-                       new ReduceAction611(170),
-                       new ReduceAction621(170),
-                       new ReduceAction622(170),
-                       new ReduceAction623(170),
-                       new ReduceAction624(170),
-                       new ReduceAction625(170),
-                       new ReduceAction626(170),
-                       new ReduceAction627(170),
-                       new ReduceAction628(170),
-                       new ReduceAction629(170),
-                       new ReduceAction630(170),
-                       new ReduceAction631(170),
-                       new ReduceAction611(170),
-                       new ReduceAction611(170),
-                       new ReduceAction611(170),
-                       new ReduceAction611(170),
-                       new ReduceAction611(170),
-                       new ReduceAction666(170),
-                       new ReduceAction611(171),
-                       new ReduceAction765(171),
-                       new ReduceAction611(172),
-                       new ReduceAction767(172),
-                       new ReduceAction768(172),
-                       new ReduceAction769(172),
-                       new ReduceAction611(173),
-                       new ReduceAction771(173),
-                       new ReduceAction611(174),
-                       new ReduceAction773(174),
-                       new ReduceAction775(174),
-                       new ReduceAction776(174),
-                       new ReduceAction777(174),
-                       new ReduceAction778(174),
-                       new ReduceAction779(174),
-                       new ReduceAction780(174),
-                       new ReduceAction781(174),
-                       new ReduceAction782(174),
-                       new ReduceAction783(174),
-                       new ReduceAction611(175),
-                       new ReduceAction765(175),
-                       new ReduceAction611(176),
-                       new ReduceAction767(176),
-                       new ReduceAction768(176),
-                       new ReduceAction769(176),
-                       new ReduceAction611(177),
-                       new ReduceAction771(177),
-                       new ReduceAction611(178),
-                       new ReduceAction773(178),
-                       new ReduceAction775(178),
-                       new ReduceAction776(178),
-                       new ReduceAction777(178),
-                       new ReduceAction778(178),
-                       new ReduceAction779(178),
-                       new ReduceAction780(178),
-                       new ReduceAction781(178),
-                       new ReduceAction782(178),
-                       new ReduceAction783(178),
-                       new ReduceAction611(179),
-                       new ReduceAction765(179),
-                       new ReduceAction611(180),
-                       new ReduceAction767(180),
-                       new ReduceAction768(180),
-                       new ReduceAction769(180),
-                       new ReduceAction611(181),
-                       new ReduceAction771(181),
-                       new ReduceAction611(182),
-                       new ReduceAction773(182),
-                       new ReduceAction775(182),
-                       new ReduceAction776(182),
-                       new ReduceAction777(182),
-                       new ReduceAction778(182),
-                       new ReduceAction779(182),
-                       new ReduceAction780(182),
-                       new ReduceAction781(182),
-                       new ReduceAction782(182),
-                       new ReduceAction783(182),
-                       new ReduceAction611(183),
-                       new ReduceAction765(183),
-                       new ReduceAction611(184),
-                       new ReduceAction767(184),
-                       new ReduceAction768(184),
-                       new ReduceAction769(184),
-                       new ReduceAction611(185),
-                       new ReduceAction771(185),
-                       new ReduceAction611(186),
-                       new ReduceAction773(186),
-                       new ReduceAction775(186),
-                       new ReduceAction776(186),
-                       new ReduceAction777(186),
-                       new ReduceAction778(186),
-                       new ReduceAction779(186),
-                       new ReduceAction780(186),
-                       new ReduceAction781(186),
-                       new ReduceAction782(186),
-                       new ReduceAction783(186),
-                       new ReduceAction877(187),
-                       new ReduceAction878(187),
-                       new ReduceAction879(187),
-                       new ReduceAction880(187),
-                       new ReduceAction881(187),
-                       new ReduceAction890(188),
-                       new ReduceAction891(188),
-                       new ReduceAction892(188),
-                       new ReduceAction891(188),
-                       new ReduceAction902(188),
-                       new ReduceAction903(188),
-                       new ReduceAction904(188),
-                       new ReduceAction903(188),
-                       new ReduceAction1764(189),
-                       new ReduceAction1765(189),
-                       new ReduceAction1766(190),
-                       new ReduceAction1767(190),
-                       new ReduceAction1768(191),
-                       new ReduceAction1769(191),
-                       new ReduceAction1770(192),
-                       new ReduceAction1771(192),
-                       new ReduceAction1772(193),
-                       new ReduceAction1773(193),
-                       new ReduceAction1770(194),
-                       new ReduceAction1771(194),
-                       new ReduceAction1776(195),
-                       new ReduceAction1777(195),
-                       new ReduceAction1778(196),
-                       new ReduceAction1779(196),
-                       new ReduceAction1780(197),
-                       new ReduceAction1781(197),
-                       new ReduceAction1782(198),
-                       new ReduceAction1783(198),
-                       new ReduceAction604(199),
-                       new ReduceAction1785(199),
-                       new ReduceAction1786(200),
-                       new ReduceAction1787(200),
-                       new ReduceAction572(201),
-                       new ReduceAction1789(201),
-                       new ReduceAction874(202),
-                       new ReduceAction1791(202),
-                       new ReduceAction874(203),
-                       new ReduceAction1791(203),
-                       new ReduceAction883(204),
-                       new ReduceAction1795(204),
-                       new ReduceAction1786(205),
-                       new ReduceAction1787(205),
-                       new ReduceAction917(206),
-                       new ReduceAction1799(206),
-                       new ReduceAction1800(207),
-                       new ReduceAction1801(207),
-                       new ReduceAction1802(208),
-                       new ReduceAction1803(208),
-                       new ReduceAction874(209),
-                       new ReduceAction1791(209)
-               )
-       end
-end
-
-redef class Prod
-       # Location on the first token after the start of a production
-       # So outside the production for epilon production
-       var _first_location: nullable Location
-end
-
-# Find location of production nodes
-# Uses existing token locations to infer location of productions.
-private class ComputeProdLocationVisitor
-       super Visitor
-       # Currenlty visited productions that need a first token
-       var _need_first_prods: Array[Prod] = new Array[Prod]
-
-       # Already visited epsilon productions that waits something after them
-       var _need_after_epsilons: Array[Prod] = new Array[Prod]
-
-       # Location of the last visited token in the current production
-       var _last_location: nullable Location = null
-
-       redef fun visit(n: ANode)
-       do
-               if n isa Token then
-                       var loc = n.location
-                       _last_location = loc
-
-                       # Add a first token to productions that need one
-                       if not _need_first_prods.is_empty then
-                               for no in _need_first_prods do
-                                       no._first_location = loc
-                               end
-                               _need_first_prods.clear
-                       end
-
-                       # Find location for already visited epsilon production that need one
-                       if not _need_after_epsilons.is_empty then
-                               var loco = new Location(loc.file, loc.line_start, loc.line_start, loc.column_start, loc.column_start) 
-                               for no in _need_after_epsilons do
-                                       no.location = loco
-                               end
-                               _need_after_epsilons.clear
-                       end
-               else
-                       assert n isa Prod
-                       _need_first_prods.add(n)
-
-                       n.visit_all(self)
-
-                       var startl = n._first_location
-                       if startl != null then
-                               # Non-epsilon production
-                               var endl = _last_location
-                               assert endl != null
-
-                               n.location = new Location(startl.file, startl.line_start, endl.line_end, startl.column_start, endl.column_end)
-
-                               if not _need_after_epsilons.is_empty then
-                                       var loc = new Location(endl.file, endl.line_end, endl.line_end, endl.column_end, endl.column_end)
-                                       for no in _need_after_epsilons do
-                                               # Epsilon production that finishes the current non-epsilon production
-                                               no.location = loc
-                                       end
-                                       _need_after_epsilons.clear
-                               end
-                       else
-                               # Epsilon production in the middle or that finishes a parent non-epsilon production
-                               _need_after_epsilons.add(n)
-                       end
-               end
-       end
-
-       init do end
-end
-
-# Each reduca action has its own class, this one is the root of the hierarchy.
-private abstract class ReduceAction
-       fun action(p: Parser) is abstract
-       fun concat(l1, l2 : Array[Object]): Array[Object]
-       do
-               if l1.is_empty then return l2
-               l1.append(l2)
-               return l1
+redef class Parser
+       redef fun build_reduce_table
+       do
+               var reduce_table = new Array[ReduceAction].with_capacity(1784)
+               reduce_table.add new ReduceAction0(0)
+               reduce_table.add new ReduceAction1(0)
+               reduce_table.add new ReduceAction2(0)
+               reduce_table.add new ReduceAction3(0)
+               reduce_table.add new ReduceAction4(0)
+               reduce_table.add new ReduceAction5(0)
+               reduce_table.add new ReduceAction6(0)
+               reduce_table.add new ReduceAction7(0)
+               reduce_table.add new ReduceAction8(0)
+               reduce_table.add new ReduceAction9(0)
+               reduce_table.add new ReduceAction10(0)
+               reduce_table.add new ReduceAction11(0)
+               reduce_table.add new ReduceAction12(0)
+               reduce_table.add new ReduceAction13(0)
+               reduce_table.add new ReduceAction14(0)
+               reduce_table.add new ReduceAction15(0)
+               reduce_table.add new ReduceAction16(1)
+               reduce_table.add new ReduceAction17(1)
+               reduce_table.add new ReduceAction18(1)
+               reduce_table.add new ReduceAction19(1)
+               reduce_table.add new ReduceAction20(1)
+               reduce_table.add new ReduceAction21(1)
+               reduce_table.add new ReduceAction22(1)
+               reduce_table.add new ReduceAction23(1)
+               reduce_table.add new ReduceAction24(1)
+               reduce_table.add new ReduceAction25(1)
+               reduce_table.add new ReduceAction26(2)
+               reduce_table.add new ReduceAction27(2)
+               reduce_table.add new ReduceAction28(2)
+               reduce_table.add new ReduceAction29(2)
+               reduce_table.add new ReduceAction30(2)
+               reduce_table.add new ReduceAction31(2)
+               reduce_table.add new ReduceAction32(2)
+               reduce_table.add new ReduceAction33(2)
+               reduce_table.add new ReduceAction34(2)
+               reduce_table.add new ReduceAction35(2)
+               reduce_table.add new ReduceAction36(2)
+               reduce_table.add new ReduceAction37(2)
+               reduce_table.add new ReduceAction38(2)
+               reduce_table.add new ReduceAction39(2)
+               reduce_table.add new ReduceAction40(2)
+               reduce_table.add new ReduceAction41(2)
+               reduce_table.add new ReduceAction42(2)
+               reduce_table.add new ReduceAction43(2)
+               reduce_table.add new ReduceAction44(2)
+               reduce_table.add new ReduceAction45(2)
+               reduce_table.add new ReduceAction46(3)
+               reduce_table.add new ReduceAction47(3)
+               reduce_table.add new ReduceAction48(4)
+               reduce_table.add new ReduceAction49(4)
+               reduce_table.add new ReduceAction50(4)
+               reduce_table.add new ReduceAction51(5)
+               reduce_table.add new ReduceAction52(5)
+               reduce_table.add new ReduceAction53(5)
+               reduce_table.add new ReduceAction54(6)
+               reduce_table.add new ReduceAction55(6)
+               reduce_table.add new ReduceAction56(6)
+               reduce_table.add new ReduceAction57(6)
+               reduce_table.add new ReduceAction58(6)
+               reduce_table.add new ReduceAction59(6)
+               reduce_table.add new ReduceAction60(6)
+               reduce_table.add new ReduceAction61(6)
+               reduce_table.add new ReduceAction62(6)
+               reduce_table.add new ReduceAction63(6)
+               reduce_table.add new ReduceAction64(6)
+               reduce_table.add new ReduceAction65(6)
+               reduce_table.add new ReduceAction66(6)
+               reduce_table.add new ReduceAction67(6)
+               reduce_table.add new ReduceAction68(6)
+               reduce_table.add new ReduceAction69(6)
+               reduce_table.add new ReduceAction70(6)
+               reduce_table.add new ReduceAction71(6)
+               reduce_table.add new ReduceAction72(6)
+               reduce_table.add new ReduceAction73(6)
+               reduce_table.add new ReduceAction74(6)
+               reduce_table.add new ReduceAction75(6)
+               reduce_table.add new ReduceAction76(6)
+               reduce_table.add new ReduceAction77(6)
+               reduce_table.add new ReduceAction78(6)
+               reduce_table.add new ReduceAction79(6)
+               reduce_table.add new ReduceAction80(6)
+               reduce_table.add new ReduceAction81(6)
+               reduce_table.add new ReduceAction82(6)
+               reduce_table.add new ReduceAction83(6)
+               reduce_table.add new ReduceAction84(6)
+               reduce_table.add new ReduceAction85(6)
+               reduce_table.add new ReduceAction86(6)
+               reduce_table.add new ReduceAction87(6)
+               reduce_table.add new ReduceAction88(6)
+               reduce_table.add new ReduceAction89(6)
+               reduce_table.add new ReduceAction90(6)
+               reduce_table.add new ReduceAction91(6)
+               reduce_table.add new ReduceAction92(6)
+               reduce_table.add new ReduceAction93(6)
+               reduce_table.add new ReduceAction94(7)
+               reduce_table.add new ReduceAction95(7)
+               reduce_table.add new ReduceAction96(7)
+               reduce_table.add new ReduceAction97(7)
+               reduce_table.add new ReduceAction98(7)
+               reduce_table.add new ReduceAction99(7)
+               reduce_table.add new ReduceAction100(8)
+               reduce_table.add new ReduceAction101(8)
+               reduce_table.add new ReduceAction102(8)
+               reduce_table.add new ReduceAction103(9)
+               reduce_table.add new ReduceAction104(10)
+               reduce_table.add new ReduceAction105(10)
+               reduce_table.add new ReduceAction106(11)
+               reduce_table.add new ReduceAction107(11)
+               reduce_table.add new ReduceAction108(11)
+               reduce_table.add new ReduceAction109(11)
+               reduce_table.add new ReduceAction110(11)
+               reduce_table.add new ReduceAction111(11)
+               reduce_table.add new ReduceAction112(11)
+               reduce_table.add new ReduceAction113(11)
+               reduce_table.add new ReduceAction114(11)
+               reduce_table.add new ReduceAction115(11)
+               reduce_table.add new ReduceAction116(12)
+               reduce_table.add new ReduceAction117(12)
+               reduce_table.add new ReduceAction118(12)
+               reduce_table.add new ReduceAction119(13)
+               reduce_table.add new ReduceAction120(14)
+               reduce_table.add new ReduceAction121(14)
+               reduce_table.add new ReduceAction122(14)
+               reduce_table.add new ReduceAction123(14)
+               reduce_table.add new ReduceAction124(14)
+               reduce_table.add new ReduceAction125(14)
+               reduce_table.add new ReduceAction126(14)
+               reduce_table.add new ReduceAction127(14)
+               reduce_table.add new ReduceAction128(14)
+               reduce_table.add new ReduceAction129(14)
+               reduce_table.add new ReduceAction130(14)
+               reduce_table.add new ReduceAction131(14)
+               reduce_table.add new ReduceAction132(14)
+               reduce_table.add new ReduceAction133(14)
+               reduce_table.add new ReduceAction134(14)
+               reduce_table.add new ReduceAction135(14)
+               reduce_table.add new ReduceAction136(14)
+               reduce_table.add new ReduceAction137(14)
+               reduce_table.add new ReduceAction138(14)
+               reduce_table.add new ReduceAction139(14)
+               reduce_table.add new ReduceAction140(14)
+               reduce_table.add new ReduceAction141(14)
+               reduce_table.add new ReduceAction142(14)
+               reduce_table.add new ReduceAction143(14)
+               reduce_table.add new ReduceAction144(14)
+               reduce_table.add new ReduceAction145(14)
+               reduce_table.add new ReduceAction146(14)
+               reduce_table.add new ReduceAction147(14)
+               reduce_table.add new ReduceAction148(14)
+               reduce_table.add new ReduceAction149(14)
+               reduce_table.add new ReduceAction150(14)
+               reduce_table.add new ReduceAction151(14)
+               reduce_table.add new ReduceAction152(14)
+               reduce_table.add new ReduceAction153(14)
+               reduce_table.add new ReduceAction154(14)
+               reduce_table.add new ReduceAction155(14)
+               reduce_table.add new ReduceAction156(14)
+               reduce_table.add new ReduceAction157(14)
+               reduce_table.add new ReduceAction158(14)
+               reduce_table.add new ReduceAction159(14)
+               reduce_table.add new ReduceAction160(14)
+               reduce_table.add new ReduceAction161(14)
+               reduce_table.add new ReduceAction162(14)
+               reduce_table.add new ReduceAction163(14)
+               reduce_table.add new ReduceAction164(14)
+               reduce_table.add new ReduceAction165(14)
+               reduce_table.add new ReduceAction166(14)
+               reduce_table.add new ReduceAction167(14)
+               reduce_table.add new ReduceAction168(14)
+               reduce_table.add new ReduceAction169(14)
+               reduce_table.add new ReduceAction170(14)
+               reduce_table.add new ReduceAction171(14)
+               reduce_table.add new ReduceAction172(14)
+               reduce_table.add new ReduceAction173(14)
+               reduce_table.add new ReduceAction174(14)
+               reduce_table.add new ReduceAction175(14)
+               reduce_table.add new ReduceAction176(14)
+               reduce_table.add new ReduceAction177(14)
+               reduce_table.add new ReduceAction178(14)
+               reduce_table.add new ReduceAction179(14)
+               reduce_table.add new ReduceAction180(14)
+               reduce_table.add new ReduceAction181(14)
+               reduce_table.add new ReduceAction182(14)
+               reduce_table.add new ReduceAction183(14)
+               reduce_table.add new ReduceAction184(14)
+               reduce_table.add new ReduceAction185(14)
+               reduce_table.add new ReduceAction186(14)
+               reduce_table.add new ReduceAction187(14)
+               reduce_table.add new ReduceAction188(14)
+               reduce_table.add new ReduceAction189(14)
+               reduce_table.add new ReduceAction190(14)
+               reduce_table.add new ReduceAction191(14)
+               reduce_table.add new ReduceAction192(14)
+               reduce_table.add new ReduceAction193(14)
+               reduce_table.add new ReduceAction194(14)
+               reduce_table.add new ReduceAction195(14)
+               reduce_table.add new ReduceAction196(14)
+               reduce_table.add new ReduceAction197(14)
+               reduce_table.add new ReduceAction198(14)
+               reduce_table.add new ReduceAction199(14)
+               reduce_table.add new ReduceAction200(14)
+               reduce_table.add new ReduceAction201(14)
+               reduce_table.add new ReduceAction202(14)
+               reduce_table.add new ReduceAction203(14)
+               reduce_table.add new ReduceAction204(14)
+               reduce_table.add new ReduceAction205(14)
+               reduce_table.add new ReduceAction206(14)
+               reduce_table.add new ReduceAction207(14)
+               reduce_table.add new ReduceAction208(14)
+               reduce_table.add new ReduceAction209(14)
+               reduce_table.add new ReduceAction210(14)
+               reduce_table.add new ReduceAction211(14)
+               reduce_table.add new ReduceAction212(14)
+               reduce_table.add new ReduceAction213(14)
+               reduce_table.add new ReduceAction214(14)
+               reduce_table.add new ReduceAction215(14)
+               reduce_table.add new ReduceAction216(14)
+               reduce_table.add new ReduceAction217(14)
+               reduce_table.add new ReduceAction218(14)
+               reduce_table.add new ReduceAction219(14)
+               reduce_table.add new ReduceAction220(14)
+               reduce_table.add new ReduceAction221(14)
+               reduce_table.add new ReduceAction222(14)
+               reduce_table.add new ReduceAction223(14)
+               reduce_table.add new ReduceAction224(14)
+               reduce_table.add new ReduceAction225(14)
+               reduce_table.add new ReduceAction226(14)
+               reduce_table.add new ReduceAction227(14)
+               reduce_table.add new ReduceAction228(14)
+               reduce_table.add new ReduceAction229(14)
+               reduce_table.add new ReduceAction230(14)
+               reduce_table.add new ReduceAction231(14)
+               reduce_table.add new ReduceAction232(14)
+               reduce_table.add new ReduceAction233(14)
+               reduce_table.add new ReduceAction234(14)
+               reduce_table.add new ReduceAction235(14)
+               reduce_table.add new ReduceAction236(14)
+               reduce_table.add new ReduceAction237(14)
+               reduce_table.add new ReduceAction238(14)
+               reduce_table.add new ReduceAction239(14)
+               reduce_table.add new ReduceAction240(14)
+               reduce_table.add new ReduceAction241(14)
+               reduce_table.add new ReduceAction242(14)
+               reduce_table.add new ReduceAction243(14)
+               reduce_table.add new ReduceAction244(14)
+               reduce_table.add new ReduceAction245(14)
+               reduce_table.add new ReduceAction246(14)
+               reduce_table.add new ReduceAction247(14)
+               reduce_table.add new ReduceAction248(14)
+               reduce_table.add new ReduceAction249(14)
+               reduce_table.add new ReduceAction250(14)
+               reduce_table.add new ReduceAction251(14)
+               reduce_table.add new ReduceAction252(14)
+               reduce_table.add new ReduceAction253(14)
+               reduce_table.add new ReduceAction254(14)
+               reduce_table.add new ReduceAction255(14)
+               reduce_table.add new ReduceAction256(14)
+               reduce_table.add new ReduceAction257(14)
+               reduce_table.add new ReduceAction258(14)
+               reduce_table.add new ReduceAction259(14)
+               reduce_table.add new ReduceAction260(14)
+               reduce_table.add new ReduceAction261(14)
+               reduce_table.add new ReduceAction262(14)
+               reduce_table.add new ReduceAction263(14)
+               reduce_table.add new ReduceAction264(14)
+               reduce_table.add new ReduceAction265(14)
+               reduce_table.add new ReduceAction266(14)
+               reduce_table.add new ReduceAction267(14)
+               reduce_table.add new ReduceAction268(14)
+               reduce_table.add new ReduceAction269(14)
+               reduce_table.add new ReduceAction270(14)
+               reduce_table.add new ReduceAction271(14)
+               reduce_table.add new ReduceAction272(14)
+               reduce_table.add new ReduceAction273(14)
+               reduce_table.add new ReduceAction274(14)
+               reduce_table.add new ReduceAction275(14)
+               reduce_table.add new ReduceAction276(14)
+               reduce_table.add new ReduceAction277(14)
+               reduce_table.add new ReduceAction278(14)
+               reduce_table.add new ReduceAction279(14)
+               reduce_table.add new ReduceAction280(14)
+               reduce_table.add new ReduceAction281(14)
+               reduce_table.add new ReduceAction282(14)
+               reduce_table.add new ReduceAction283(14)
+               reduce_table.add new ReduceAction284(14)
+               reduce_table.add new ReduceAction285(14)
+               reduce_table.add new ReduceAction286(14)
+               reduce_table.add new ReduceAction287(14)
+               reduce_table.add new ReduceAction288(14)
+               reduce_table.add new ReduceAction289(14)
+               reduce_table.add new ReduceAction290(14)
+               reduce_table.add new ReduceAction291(14)
+               reduce_table.add new ReduceAction292(14)
+               reduce_table.add new ReduceAction293(14)
+               reduce_table.add new ReduceAction294(14)
+               reduce_table.add new ReduceAction295(14)
+               reduce_table.add new ReduceAction296(14)
+               reduce_table.add new ReduceAction297(14)
+               reduce_table.add new ReduceAction298(14)
+               reduce_table.add new ReduceAction299(14)
+               reduce_table.add new ReduceAction300(14)
+               reduce_table.add new ReduceAction301(14)
+               reduce_table.add new ReduceAction302(14)
+               reduce_table.add new ReduceAction303(14)
+               reduce_table.add new ReduceAction304(14)
+               reduce_table.add new ReduceAction305(14)
+               reduce_table.add new ReduceAction306(14)
+               reduce_table.add new ReduceAction307(14)
+               reduce_table.add new ReduceAction308(14)
+               reduce_table.add new ReduceAction309(14)
+               reduce_table.add new ReduceAction310(14)
+               reduce_table.add new ReduceAction311(14)
+               reduce_table.add new ReduceAction312(14)
+               reduce_table.add new ReduceAction313(14)
+               reduce_table.add new ReduceAction314(14)
+               reduce_table.add new ReduceAction315(14)
+               reduce_table.add new ReduceAction316(14)
+               reduce_table.add new ReduceAction317(14)
+               reduce_table.add new ReduceAction318(14)
+               reduce_table.add new ReduceAction319(14)
+               reduce_table.add new ReduceAction320(14)
+               reduce_table.add new ReduceAction321(14)
+               reduce_table.add new ReduceAction322(14)
+               reduce_table.add new ReduceAction323(14)
+               reduce_table.add new ReduceAction324(14)
+               reduce_table.add new ReduceAction325(14)
+               reduce_table.add new ReduceAction326(14)
+               reduce_table.add new ReduceAction327(14)
+               reduce_table.add new ReduceAction328(14)
+               reduce_table.add new ReduceAction329(14)
+               reduce_table.add new ReduceAction330(14)
+               reduce_table.add new ReduceAction331(14)
+               reduce_table.add new ReduceAction332(14)
+               reduce_table.add new ReduceAction333(14)
+               reduce_table.add new ReduceAction334(14)
+               reduce_table.add new ReduceAction335(14)
+               reduce_table.add new ReduceAction336(14)
+               reduce_table.add new ReduceAction337(14)
+               reduce_table.add new ReduceAction338(14)
+               reduce_table.add new ReduceAction339(14)
+               reduce_table.add new ReduceAction340(14)
+               reduce_table.add new ReduceAction341(14)
+               reduce_table.add new ReduceAction342(14)
+               reduce_table.add new ReduceAction343(14)
+               reduce_table.add new ReduceAction344(14)
+               reduce_table.add new ReduceAction345(14)
+               reduce_table.add new ReduceAction346(14)
+               reduce_table.add new ReduceAction347(14)
+               reduce_table.add new ReduceAction348(14)
+               reduce_table.add new ReduceAction349(14)
+               reduce_table.add new ReduceAction350(14)
+               reduce_table.add new ReduceAction351(14)
+               reduce_table.add new ReduceAction352(14)
+               reduce_table.add new ReduceAction353(14)
+               reduce_table.add new ReduceAction354(14)
+               reduce_table.add new ReduceAction355(14)
+               reduce_table.add new ReduceAction356(14)
+               reduce_table.add new ReduceAction357(14)
+               reduce_table.add new ReduceAction358(14)
+               reduce_table.add new ReduceAction359(14)
+               reduce_table.add new ReduceAction360(14)
+               reduce_table.add new ReduceAction361(14)
+               reduce_table.add new ReduceAction362(14)
+               reduce_table.add new ReduceAction363(14)
+               reduce_table.add new ReduceAction364(14)
+               reduce_table.add new ReduceAction365(14)
+               reduce_table.add new ReduceAction366(14)
+               reduce_table.add new ReduceAction367(14)
+               reduce_table.add new ReduceAction368(14)
+               reduce_table.add new ReduceAction369(14)
+               reduce_table.add new ReduceAction370(14)
+               reduce_table.add new ReduceAction371(14)
+               reduce_table.add new ReduceAction372(14)
+               reduce_table.add new ReduceAction373(14)
+               reduce_table.add new ReduceAction374(14)
+               reduce_table.add new ReduceAction375(14)
+               reduce_table.add new ReduceAction376(14)
+               reduce_table.add new ReduceAction377(14)
+               reduce_table.add new ReduceAction378(14)
+               reduce_table.add new ReduceAction379(14)
+               reduce_table.add new ReduceAction380(14)
+               reduce_table.add new ReduceAction381(14)
+               reduce_table.add new ReduceAction382(14)
+               reduce_table.add new ReduceAction383(14)
+               reduce_table.add new ReduceAction384(14)
+               reduce_table.add new ReduceAction385(14)
+               reduce_table.add new ReduceAction386(14)
+               reduce_table.add new ReduceAction387(14)
+               reduce_table.add new ReduceAction388(14)
+               reduce_table.add new ReduceAction389(14)
+               reduce_table.add new ReduceAction390(14)
+               reduce_table.add new ReduceAction391(14)
+               reduce_table.add new ReduceAction392(14)
+               reduce_table.add new ReduceAction393(14)
+               reduce_table.add new ReduceAction394(14)
+               reduce_table.add new ReduceAction395(14)
+               reduce_table.add new ReduceAction396(14)
+               reduce_table.add new ReduceAction397(14)
+               reduce_table.add new ReduceAction398(14)
+               reduce_table.add new ReduceAction399(14)
+               reduce_table.add new ReduceAction400(14)
+               reduce_table.add new ReduceAction400(14)
+               reduce_table.add new ReduceAction402(15)
+               reduce_table.add new ReduceAction403(15)
+               reduce_table.add new ReduceAction49(15)
+               reduce_table.add new ReduceAction402(16)
+               reduce_table.add new ReduceAction406(16)
+               reduce_table.add new ReduceAction407(17)
+               reduce_table.add new ReduceAction408(17)
+               reduce_table.add new ReduceAction409(17)
+               reduce_table.add new ReduceAction410(17)
+               reduce_table.add new ReduceAction411(17)
+               reduce_table.add new ReduceAction412(17)
+               reduce_table.add new ReduceAction413(17)
+               reduce_table.add new ReduceAction414(17)
+               reduce_table.add new ReduceAction415(17)
+               reduce_table.add new ReduceAction416(17)
+               reduce_table.add new ReduceAction417(17)
+               reduce_table.add new ReduceAction418(17)
+               reduce_table.add new ReduceAction419(17)
+               reduce_table.add new ReduceAction420(17)
+               reduce_table.add new ReduceAction421(17)
+               reduce_table.add new ReduceAction422(17)
+               reduce_table.add new ReduceAction423(17)
+               reduce_table.add new ReduceAction424(17)
+               reduce_table.add new ReduceAction425(17)
+               reduce_table.add new ReduceAction426(17)
+               reduce_table.add new ReduceAction427(17)
+               reduce_table.add new ReduceAction428(17)
+               reduce_table.add new ReduceAction429(17)
+               reduce_table.add new ReduceAction430(18)
+               reduce_table.add new ReduceAction431(18)
+               reduce_table.add new ReduceAction432(18)
+               reduce_table.add new ReduceAction433(18)
+               reduce_table.add new ReduceAction434(19)
+               reduce_table.add new ReduceAction435(19)
+               reduce_table.add new ReduceAction102(19)
+               reduce_table.add new ReduceAction437(20)
+               reduce_table.add new ReduceAction438(21)
+               reduce_table.add new ReduceAction439(21)
+               reduce_table.add new ReduceAction440(21)
+               reduce_table.add new ReduceAction441(21)
+               reduce_table.add new ReduceAction442(21)
+               reduce_table.add new ReduceAction443(22)
+               reduce_table.add new ReduceAction444(22)
+               reduce_table.add new ReduceAction49(22)
+               reduce_table.add new ReduceAction446(23)
+               reduce_table.add new ReduceAction447(24)
+               reduce_table.add new ReduceAction447(24)
+               reduce_table.add new ReduceAction449(24)
+               reduce_table.add new ReduceAction450(25)
+               reduce_table.add new ReduceAction451(25)
+               reduce_table.add new ReduceAction452(25)
+               reduce_table.add new ReduceAction453(26)
+               reduce_table.add new ReduceAction454(26)
+               reduce_table.add new ReduceAction455(26)
+               reduce_table.add new ReduceAction456(26)
+               reduce_table.add new ReduceAction457(26)
+               reduce_table.add new ReduceAction458(26)
+               reduce_table.add new ReduceAction49(27)
+               reduce_table.add new ReduceAction460(27)
+               reduce_table.add new ReduceAction461(28)
+               reduce_table.add new ReduceAction462(29)
+               reduce_table.add new ReduceAction463(29)
+               reduce_table.add new ReduceAction464(30)
+               reduce_table.add new ReduceAction49(30)
+               reduce_table.add new ReduceAction466(31)
+               reduce_table.add new ReduceAction467(32)
+               reduce_table.add new ReduceAction468(32)
+               reduce_table.add new ReduceAction468(32)
+               reduce_table.add new ReduceAction470(33)
+               reduce_table.add new ReduceAction471(33)
+               reduce_table.add new ReduceAction472(33)
+               reduce_table.add new ReduceAction473(33)
+               reduce_table.add new ReduceAction474(34)
+               reduce_table.add new ReduceAction475(34)
+               reduce_table.add new ReduceAction476(35)
+               reduce_table.add new ReduceAction476(36)
+               reduce_table.add new ReduceAction476(37)
+               reduce_table.add new ReduceAction49(37)
+               reduce_table.add new ReduceAction480(38)
+               reduce_table.add new ReduceAction481(38)
+               reduce_table.add new ReduceAction482(38)
+               reduce_table.add new ReduceAction483(38)
+               reduce_table.add new ReduceAction484(39)
+               reduce_table.add new ReduceAction485(39)
+               reduce_table.add new ReduceAction486(40)
+               reduce_table.add new ReduceAction487(40)
+               reduce_table.add new ReduceAction480(41)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction491(42)
+               reduce_table.add new ReduceAction492(42)
+               reduce_table.add new ReduceAction493(42)
+               reduce_table.add new ReduceAction494(42)
+               reduce_table.add new ReduceAction495(42)
+               reduce_table.add new ReduceAction496(42)
+               reduce_table.add new ReduceAction497(42)
+               reduce_table.add new ReduceAction498(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction483(42)
+               reduce_table.add new ReduceAction506(42)
+               reduce_table.add new ReduceAction507(42)
+               reduce_table.add new ReduceAction508(42)
+               reduce_table.add new ReduceAction509(42)
+               reduce_table.add new ReduceAction510(42)
+               reduce_table.add new ReduceAction511(42)
+               reduce_table.add new ReduceAction512(42)
+               reduce_table.add new ReduceAction513(42)
+               reduce_table.add new ReduceAction514(42)
+               reduce_table.add new ReduceAction515(42)
+               reduce_table.add new ReduceAction516(42)
+               reduce_table.add new ReduceAction517(42)
+               reduce_table.add new ReduceAction518(42)
+               reduce_table.add new ReduceAction519(42)
+               reduce_table.add new ReduceAction520(42)
+               reduce_table.add new ReduceAction521(42)
+               reduce_table.add new ReduceAction522(42)
+               reduce_table.add new ReduceAction523(42)
+               reduce_table.add new ReduceAction522(42)
+               reduce_table.add new ReduceAction525(42)
+               reduce_table.add new ReduceAction526(42)
+               reduce_table.add new ReduceAction525(42)
+               reduce_table.add new ReduceAction528(42)
+               reduce_table.add new ReduceAction529(42)
+               reduce_table.add new ReduceAction528(42)
+               reduce_table.add new ReduceAction531(42)
+               reduce_table.add new ReduceAction532(43)
+               reduce_table.add new ReduceAction533(43)
+               reduce_table.add new ReduceAction534(44)
+               reduce_table.add new ReduceAction535(44)
+               reduce_table.add new ReduceAction536(44)
+               reduce_table.add new ReduceAction537(44)
+               reduce_table.add new ReduceAction538(45)
+               reduce_table.add new ReduceAction539(45)
+               reduce_table.add new ReduceAction540(45)
+               reduce_table.add new ReduceAction541(45)
+               reduce_table.add new ReduceAction542(45)
+               reduce_table.add new ReduceAction543(45)
+               reduce_table.add new ReduceAction544(45)
+               reduce_table.add new ReduceAction545(45)
+               reduce_table.add new ReduceAction546(45)
+               reduce_table.add new ReduceAction547(45)
+               reduce_table.add new ReduceAction548(45)
+               reduce_table.add new ReduceAction549(45)
+               reduce_table.add new ReduceAction550(45)
+               reduce_table.add new ReduceAction551(45)
+               reduce_table.add new ReduceAction552(45)
+               reduce_table.add new ReduceAction553(45)
+               reduce_table.add new ReduceAction554(45)
+               reduce_table.add new ReduceAction555(45)
+               reduce_table.add new ReduceAction556(45)
+               reduce_table.add new ReduceAction557(45)
+               reduce_table.add new ReduceAction558(45)
+               reduce_table.add new ReduceAction559(45)
+               reduce_table.add new ReduceAction560(45)
+               reduce_table.add new ReduceAction561(45)
+               reduce_table.add new ReduceAction562(45)
+               reduce_table.add new ReduceAction563(45)
+               reduce_table.add new ReduceAction564(45)
+               reduce_table.add new ReduceAction565(45)
+               reduce_table.add new ReduceAction566(45)
+               reduce_table.add new ReduceAction567(45)
+               reduce_table.add new ReduceAction568(45)
+               reduce_table.add new ReduceAction569(45)
+               reduce_table.add new ReduceAction570(45)
+               reduce_table.add new ReduceAction571(45)
+               reduce_table.add new ReduceAction572(45)
+               reduce_table.add new ReduceAction573(45)
+               reduce_table.add new ReduceAction574(45)
+               reduce_table.add new ReduceAction575(45)
+               reduce_table.add new ReduceAction576(45)
+               reduce_table.add new ReduceAction577(45)
+               reduce_table.add new ReduceAction578(45)
+               reduce_table.add new ReduceAction579(45)
+               reduce_table.add new ReduceAction580(45)
+               reduce_table.add new ReduceAction581(45)
+               reduce_table.add new ReduceAction582(45)
+               reduce_table.add new ReduceAction583(45)
+               reduce_table.add new ReduceAction584(45)
+               reduce_table.add new ReduceAction585(45)
+               reduce_table.add new ReduceAction586(45)
+               reduce_table.add new ReduceAction587(45)
+               reduce_table.add new ReduceAction588(45)
+               reduce_table.add new ReduceAction589(45)
+               reduce_table.add new ReduceAction590(45)
+               reduce_table.add new ReduceAction591(45)
+               reduce_table.add new ReduceAction592(45)
+               reduce_table.add new ReduceAction593(45)
+               reduce_table.add new ReduceAction594(46)
+               reduce_table.add new ReduceAction595(46)
+               reduce_table.add new ReduceAction596(46)
+               reduce_table.add new ReduceAction597(46)
+               reduce_table.add new ReduceAction598(46)
+               reduce_table.add new ReduceAction599(46)
+               reduce_table.add new ReduceAction600(46)
+               reduce_table.add new ReduceAction601(46)
+               reduce_table.add new ReduceAction602(46)
+               reduce_table.add new ReduceAction603(46)
+               reduce_table.add new ReduceAction604(46)
+               reduce_table.add new ReduceAction605(47)
+               reduce_table.add new ReduceAction606(47)
+               reduce_table.add new ReduceAction607(47)
+               reduce_table.add new ReduceAction608(48)
+               reduce_table.add new ReduceAction609(48)
+               reduce_table.add new ReduceAction610(48)
+               reduce_table.add new ReduceAction611(48)
+               reduce_table.add new ReduceAction612(48)
+               reduce_table.add new ReduceAction613(48)
+               reduce_table.add new ReduceAction614(48)
+               reduce_table.add new ReduceAction615(48)
+               reduce_table.add new ReduceAction482(49)
+               reduce_table.add new ReduceAction617(50)
+               reduce_table.add new ReduceAction618(50)
+               reduce_table.add new ReduceAction619(51)
+               reduce_table.add new ReduceAction620(51)
+               reduce_table.add new ReduceAction621(52)
+               reduce_table.add new ReduceAction622(52)
+               reduce_table.add new ReduceAction623(53)
+               reduce_table.add new ReduceAction624(53)
+               reduce_table.add new ReduceAction625(54)
+               reduce_table.add new ReduceAction626(55)
+               reduce_table.add new ReduceAction627(55)
+               reduce_table.add new ReduceAction628(56)
+               reduce_table.add new ReduceAction629(56)
+               reduce_table.add new ReduceAction483(56)
+               reduce_table.add new ReduceAction631(57)
+               reduce_table.add new ReduceAction632(57)
+               reduce_table.add new ReduceAction633(57)
+               reduce_table.add new ReduceAction634(57)
+               reduce_table.add new ReduceAction635(58)
+               reduce_table.add new ReduceAction483(59)
+               reduce_table.add new ReduceAction637(59)
+               reduce_table.add new ReduceAction483(60)
+               reduce_table.add new ReduceAction639(60)
+               reduce_table.add new ReduceAction640(60)
+               reduce_table.add new ReduceAction641(60)
+               reduce_table.add new ReduceAction642(60)
+               reduce_table.add new ReduceAction483(61)
+               reduce_table.add new ReduceAction644(61)
+               reduce_table.add new ReduceAction483(62)
+               reduce_table.add new ReduceAction646(62)
+               reduce_table.add new ReduceAction647(62)
+               reduce_table.add new ReduceAction648(62)
+               reduce_table.add new ReduceAction649(62)
+               reduce_table.add new ReduceAction650(62)
+               reduce_table.add new ReduceAction651(62)
+               reduce_table.add new ReduceAction652(62)
+               reduce_table.add new ReduceAction653(62)
+               reduce_table.add new ReduceAction483(63)
+               reduce_table.add new ReduceAction655(63)
+               reduce_table.add new ReduceAction483(64)
+               reduce_table.add new ReduceAction657(64)
+               reduce_table.add new ReduceAction483(65)
+               reduce_table.add new ReduceAction659(65)
+               reduce_table.add new ReduceAction483(66)
+               reduce_table.add new ReduceAction661(66)
+               reduce_table.add new ReduceAction662(66)
+               reduce_table.add new ReduceAction483(67)
+               reduce_table.add new ReduceAction664(67)
+               reduce_table.add new ReduceAction665(67)
+               reduce_table.add new ReduceAction483(68)
+               reduce_table.add new ReduceAction667(68)
+               reduce_table.add new ReduceAction668(68)
+               reduce_table.add new ReduceAction669(68)
+               reduce_table.add new ReduceAction483(69)
+               reduce_table.add new ReduceAction671(69)
+               reduce_table.add new ReduceAction483(70)
+               reduce_table.add new ReduceAction673(70)
+               reduce_table.add new ReduceAction674(70)
+               reduce_table.add new ReduceAction675(70)
+               reduce_table.add new ReduceAction676(70)
+               reduce_table.add new ReduceAction483(71)
+               reduce_table.add new ReduceAction678(71)
+               reduce_table.add new ReduceAction679(71)
+               reduce_table.add new ReduceAction680(71)
+               reduce_table.add new ReduceAction681(71)
+               reduce_table.add new ReduceAction682(71)
+               reduce_table.add new ReduceAction683(71)
+               reduce_table.add new ReduceAction684(71)
+               reduce_table.add new ReduceAction685(71)
+               reduce_table.add new ReduceAction686(71)
+               reduce_table.add new ReduceAction687(71)
+               reduce_table.add new ReduceAction688(71)
+               reduce_table.add new ReduceAction689(71)
+               reduce_table.add new ReduceAction690(71)
+               reduce_table.add new ReduceAction691(71)
+               reduce_table.add new ReduceAction692(71)
+               reduce_table.add new ReduceAction693(71)
+               reduce_table.add new ReduceAction694(71)
+               reduce_table.add new ReduceAction695(71)
+               reduce_table.add new ReduceAction696(71)
+               reduce_table.add new ReduceAction697(71)
+               reduce_table.add new ReduceAction698(71)
+               reduce_table.add new ReduceAction699(71)
+               reduce_table.add new ReduceAction700(71)
+               reduce_table.add new ReduceAction701(71)
+               reduce_table.add new ReduceAction702(71)
+               reduce_table.add new ReduceAction703(71)
+               reduce_table.add new ReduceAction704(71)
+               reduce_table.add new ReduceAction705(71)
+               reduce_table.add new ReduceAction706(71)
+               reduce_table.add new ReduceAction483(72)
+               reduce_table.add new ReduceAction708(72)
+               reduce_table.add new ReduceAction709(72)
+               reduce_table.add new ReduceAction710(72)
+               reduce_table.add new ReduceAction506(72)
+               reduce_table.add new ReduceAction712(72)
+               reduce_table.add new ReduceAction507(72)
+               reduce_table.add new ReduceAction714(72)
+               reduce_table.add new ReduceAction508(72)
+               reduce_table.add new ReduceAction716(72)
+               reduce_table.add new ReduceAction509(72)
+               reduce_table.add new ReduceAction718(72)
+               reduce_table.add new ReduceAction510(72)
+               reduce_table.add new ReduceAction720(72)
+               reduce_table.add new ReduceAction511(72)
+               reduce_table.add new ReduceAction722(72)
+               reduce_table.add new ReduceAction512(72)
+               reduce_table.add new ReduceAction724(72)
+               reduce_table.add new ReduceAction513(72)
+               reduce_table.add new ReduceAction726(72)
+               reduce_table.add new ReduceAction514(72)
+               reduce_table.add new ReduceAction728(72)
+               reduce_table.add new ReduceAction515(72)
+               reduce_table.add new ReduceAction730(72)
+               reduce_table.add new ReduceAction516(72)
+               reduce_table.add new ReduceAction732(72)
+               reduce_table.add new ReduceAction517(72)
+               reduce_table.add new ReduceAction734(72)
+               reduce_table.add new ReduceAction518(72)
+               reduce_table.add new ReduceAction736(72)
+               reduce_table.add new ReduceAction519(72)
+               reduce_table.add new ReduceAction738(72)
+               reduce_table.add new ReduceAction520(72)
+               reduce_table.add new ReduceAction740(72)
+               reduce_table.add new ReduceAction521(72)
+               reduce_table.add new ReduceAction742(72)
+               reduce_table.add new ReduceAction743(72)
+               reduce_table.add new ReduceAction744(72)
+               reduce_table.add new ReduceAction745(72)
+               reduce_table.add new ReduceAction746(72)
+               reduce_table.add new ReduceAction747(72)
+               reduce_table.add new ReduceAction748(72)
+               reduce_table.add new ReduceAction749(72)
+               reduce_table.add new ReduceAction750(72)
+               reduce_table.add new ReduceAction751(72)
+               reduce_table.add new ReduceAction752(72)
+               reduce_table.add new ReduceAction753(72)
+               reduce_table.add new ReduceAction754(72)
+               reduce_table.add new ReduceAction483(73)
+               reduce_table.add new ReduceAction756(73)
+               reduce_table.add new ReduceAction757(73)
+               reduce_table.add new ReduceAction758(74)
+               reduce_table.add new ReduceAction759(74)
+               reduce_table.add new ReduceAction760(74)
+               reduce_table.add new ReduceAction761(74)
+               reduce_table.add new ReduceAction762(74)
+               reduce_table.add new ReduceAction763(74)
+               reduce_table.add new ReduceAction764(74)
+               reduce_table.add new ReduceAction765(74)
+               reduce_table.add new ReduceAction483(74)
+               reduce_table.add new ReduceAction767(74)
+               reduce_table.add new ReduceAction768(74)
+               reduce_table.add new ReduceAction769(74)
+               reduce_table.add new ReduceAction483(74)
+               reduce_table.add new ReduceAction771(74)
+               reduce_table.add new ReduceAction772(74)
+               reduce_table.add new ReduceAction773(74)
+               reduce_table.add new ReduceAction774(75)
+               reduce_table.add new ReduceAction774(75)
+               reduce_table.add new ReduceAction776(76)
+               reduce_table.add new ReduceAction777(77)
+               reduce_table.add new ReduceAction778(78)
+               reduce_table.add new ReduceAction779(78)
+               reduce_table.add new ReduceAction777(79)
+               reduce_table.add new ReduceAction781(80)
+               reduce_table.add new ReduceAction622(80)
+               reduce_table.add new ReduceAction783(80)
+               reduce_table.add new ReduceAction784(81)
+               reduce_table.add new ReduceAction785(81)
+               reduce_table.add new ReduceAction786(82)
+               reduce_table.add new ReduceAction787(82)
+               reduce_table.add new ReduceAction788(83)
+               reduce_table.add new ReduceAction786(84)
+               reduce_table.add new ReduceAction787(84)
+               reduce_table.add new ReduceAction791(85)
+               reduce_table.add new ReduceAction792(86)
+               reduce_table.add new ReduceAction793(87)
+               reduce_table.add new ReduceAction794(87)
+               reduce_table.add new ReduceAction795(88)
+               reduce_table.add new ReduceAction49(88)
+               reduce_table.add new ReduceAction797(89)
+               reduce_table.add new ReduceAction798(89)
+               reduce_table.add new ReduceAction799(89)
+               reduce_table.add new ReduceAction800(89)
+               reduce_table.add new ReduceAction801(89)
+               reduce_table.add new ReduceAction802(89)
+               reduce_table.add new ReduceAction803(89)
+               reduce_table.add new ReduceAction804(89)
+               reduce_table.add new ReduceAction805(89)
+               reduce_table.add new ReduceAction806(89)
+               reduce_table.add new ReduceAction807(89)
+               reduce_table.add new ReduceAction808(89)
+               reduce_table.add new ReduceAction809(89)
+               reduce_table.add new ReduceAction810(89)
+               reduce_table.add new ReduceAction811(89)
+               reduce_table.add new ReduceAction812(89)
+               reduce_table.add new ReduceAction813(89)
+               reduce_table.add new ReduceAction814(89)
+               reduce_table.add new ReduceAction815(89)
+               reduce_table.add new ReduceAction816(89)
+               reduce_table.add new ReduceAction817(90)
+               reduce_table.add new ReduceAction818(90)
+               reduce_table.add new ReduceAction797(91)
+               reduce_table.add new ReduceAction798(91)
+               reduce_table.add new ReduceAction799(91)
+               reduce_table.add new ReduceAction800(91)
+               reduce_table.add new ReduceAction801(91)
+               reduce_table.add new ReduceAction802(91)
+               reduce_table.add new ReduceAction803(91)
+               reduce_table.add new ReduceAction804(91)
+               reduce_table.add new ReduceAction805(91)
+               reduce_table.add new ReduceAction806(91)
+               reduce_table.add new ReduceAction807(91)
+               reduce_table.add new ReduceAction808(91)
+               reduce_table.add new ReduceAction809(91)
+               reduce_table.add new ReduceAction810(91)
+               reduce_table.add new ReduceAction811(91)
+               reduce_table.add new ReduceAction812(91)
+               reduce_table.add new ReduceAction813(91)
+               reduce_table.add new ReduceAction814(91)
+               reduce_table.add new ReduceAction815(91)
+               reduce_table.add new ReduceAction816(91)
+               reduce_table.add new ReduceAction839(91)
+               reduce_table.add new ReduceAction840(91)
+               reduce_table.add new ReduceAction841(91)
+               reduce_table.add new ReduceAction842(91)
+               reduce_table.add new ReduceAction843(91)
+               reduce_table.add new ReduceAction844(91)
+               reduce_table.add new ReduceAction845(91)
+               reduce_table.add new ReduceAction846(91)
+               reduce_table.add new ReduceAction847(91)
+               reduce_table.add new ReduceAction848(91)
+               reduce_table.add new ReduceAction483(92)
+               reduce_table.add new ReduceAction850(93)
+               reduce_table.add new ReduceAction851(94)
+               reduce_table.add new ReduceAction852(94)
+               reduce_table.add new ReduceAction853(94)
+               reduce_table.add new ReduceAction854(94)
+               reduce_table.add new ReduceAction855(94)
+               reduce_table.add new ReduceAction856(94)
+               reduce_table.add new ReduceAction857(94)
+               reduce_table.add new ReduceAction858(94)
+               reduce_table.add new ReduceAction859(94)
+               reduce_table.add new ReduceAction860(94)
+               reduce_table.add new ReduceAction861(94)
+               reduce_table.add new ReduceAction862(94)
+               reduce_table.add new ReduceAction863(94)
+               reduce_table.add new ReduceAction864(94)
+               reduce_table.add new ReduceAction865(94)
+               reduce_table.add new ReduceAction866(94)
+               reduce_table.add new ReduceAction867(94)
+               reduce_table.add new ReduceAction868(94)
+               reduce_table.add new ReduceAction869(94)
+               reduce_table.add new ReduceAction870(94)
+               reduce_table.add new ReduceAction871(94)
+               reduce_table.add new ReduceAction872(94)
+               reduce_table.add new ReduceAction873(94)
+               reduce_table.add new ReduceAction874(94)
+               reduce_table.add new ReduceAction875(94)
+               reduce_table.add new ReduceAction876(94)
+               reduce_table.add new ReduceAction877(94)
+               reduce_table.add new ReduceAction878(94)
+               reduce_table.add new ReduceAction879(94)
+               reduce_table.add new ReduceAction880(94)
+               reduce_table.add new ReduceAction881(94)
+               reduce_table.add new ReduceAction882(94)
+               reduce_table.add new ReduceAction883(94)
+               reduce_table.add new ReduceAction884(94)
+               reduce_table.add new ReduceAction885(94)
+               reduce_table.add new ReduceAction886(94)
+               reduce_table.add new ReduceAction887(94)
+               reduce_table.add new ReduceAction888(94)
+               reduce_table.add new ReduceAction889(94)
+               reduce_table.add new ReduceAction890(94)
+               reduce_table.add new ReduceAction891(94)
+               reduce_table.add new ReduceAction892(94)
+               reduce_table.add new ReduceAction893(94)
+               reduce_table.add new ReduceAction894(94)
+               reduce_table.add new ReduceAction895(94)
+               reduce_table.add new ReduceAction896(94)
+               reduce_table.add new ReduceAction897(94)
+               reduce_table.add new ReduceAction898(94)
+               reduce_table.add new ReduceAction899(94)
+               reduce_table.add new ReduceAction900(94)
+               reduce_table.add new ReduceAction901(95)
+               reduce_table.add new ReduceAction902(95)
+               reduce_table.add new ReduceAction903(95)
+               reduce_table.add new ReduceAction904(95)
+               reduce_table.add new ReduceAction905(95)
+               reduce_table.add new ReduceAction778(96)
+               reduce_table.add new ReduceAction779(96)
+               reduce_table.add new ReduceAction777(97)
+               reduce_table.add new ReduceAction909(98)
+               reduce_table.add new ReduceAction483(98)
+               reduce_table.add new ReduceAction483(98)
+               reduce_table.add new ReduceAction912(98)
+               reduce_table.add new ReduceAction913(98)
+               reduce_table.add new ReduceAction914(98)
+               reduce_table.add new ReduceAction915(98)
+               reduce_table.add new ReduceAction916(99)
+               reduce_table.add new ReduceAction917(99)
+               reduce_table.add new ReduceAction918(99)
+               reduce_table.add new ReduceAction919(100)
+               reduce_table.add new ReduceAction920(100)
+               reduce_table.add new ReduceAction919(101)
+               reduce_table.add new ReduceAction922(101)
+               reduce_table.add new ReduceAction920(101)
+               reduce_table.add new ReduceAction924(101)
+               reduce_table.add new ReduceAction925(102)
+               reduce_table.add new ReduceAction787(103)
+               reduce_table.add new ReduceAction927(103)
+               reduce_table.add new ReduceAction928(104)
+               reduce_table.add new ReduceAction929(105)
+               reduce_table.add new ReduceAction930(105)
+               reduce_table.add new ReduceAction931(106)
+               reduce_table.add new ReduceAction932(106)
+               reduce_table.add new ReduceAction933(107)
+               reduce_table.add new ReduceAction934(107)
+               reduce_table.add new ReduceAction935(107)
+               reduce_table.add new ReduceAction936(107)
+               reduce_table.add new ReduceAction937(108)
+               reduce_table.add new ReduceAction938(108)
+               reduce_table.add new ReduceAction939(108)
+               reduce_table.add new ReduceAction49(108)
+               reduce_table.add new ReduceAction941(109)
+               reduce_table.add new ReduceAction942(109)
+               reduce_table.add new ReduceAction943(109)
+               reduce_table.add new ReduceAction944(109)
+               reduce_table.add new ReduceAction945(110)
+               reduce_table.add new ReduceAction946(110)
+               reduce_table.add new ReduceAction947(110)
+               reduce_table.add new ReduceAction946(110)
+               reduce_table.add new ReduceAction949(111)
+               reduce_table.add new ReduceAction950(112)
+               reduce_table.add new ReduceAction49(113)
+               reduce_table.add new ReduceAction952(113)
+               reduce_table.add new ReduceAction953(114)
+               reduce_table.add new ReduceAction953(114)
+               reduce_table.add new ReduceAction953(114)
+               reduce_table.add new ReduceAction956(115)
+               reduce_table.add new ReduceAction957(115)
+               reduce_table.add new ReduceAction50(115)
+               reduce_table.add new ReduceAction50(115)
+               reduce_table.add new ReduceAction960(115)
+               reduce_table.add new ReduceAction960(115)
+               reduce_table.add new ReduceAction962(115)
+               reduce_table.add new ReduceAction963(115)
+               reduce_table.add new ReduceAction964(115)
+               reduce_table.add new ReduceAction964(115)
+               reduce_table.add new ReduceAction966(115)
+               reduce_table.add new ReduceAction49(116)
+               reduce_table.add new ReduceAction968(116)
+               reduce_table.add new ReduceAction969(117)
+               reduce_table.add new ReduceAction953(117)
+               reduce_table.add new ReduceAction953(118)
+               reduce_table.add new ReduceAction972(118)
+               reduce_table.add new ReduceAction120(119)
+               reduce_table.add new ReduceAction121(119)
+               reduce_table.add new ReduceAction122(119)
+               reduce_table.add new ReduceAction123(119)
+               reduce_table.add new ReduceAction124(119)
+               reduce_table.add new ReduceAction125(119)
+               reduce_table.add new ReduceAction126(119)
+               reduce_table.add new ReduceAction127(119)
+               reduce_table.add new ReduceAction128(119)
+               reduce_table.add new ReduceAction129(119)
+               reduce_table.add new ReduceAction130(119)
+               reduce_table.add new ReduceAction131(119)
+               reduce_table.add new ReduceAction132(119)
+               reduce_table.add new ReduceAction133(119)
+               reduce_table.add new ReduceAction134(119)
+               reduce_table.add new ReduceAction135(119)
+               reduce_table.add new ReduceAction136(119)
+               reduce_table.add new ReduceAction137(119)
+               reduce_table.add new ReduceAction138(119)
+               reduce_table.add new ReduceAction139(119)
+               reduce_table.add new ReduceAction140(119)
+               reduce_table.add new ReduceAction141(119)
+               reduce_table.add new ReduceAction142(119)
+               reduce_table.add new ReduceAction143(119)
+               reduce_table.add new ReduceAction144(119)
+               reduce_table.add new ReduceAction145(119)
+               reduce_table.add new ReduceAction146(119)
+               reduce_table.add new ReduceAction147(119)
+               reduce_table.add new ReduceAction148(119)
+               reduce_table.add new ReduceAction149(119)
+               reduce_table.add new ReduceAction230(119)
+               reduce_table.add new ReduceAction231(119)
+               reduce_table.add new ReduceAction232(119)
+               reduce_table.add new ReduceAction233(119)
+               reduce_table.add new ReduceAction234(119)
+               reduce_table.add new ReduceAction235(119)
+               reduce_table.add new ReduceAction236(119)
+               reduce_table.add new ReduceAction237(119)
+               reduce_table.add new ReduceAction238(119)
+               reduce_table.add new ReduceAction239(119)
+               reduce_table.add new ReduceAction240(119)
+               reduce_table.add new ReduceAction241(119)
+               reduce_table.add new ReduceAction242(119)
+               reduce_table.add new ReduceAction243(119)
+               reduce_table.add new ReduceAction244(119)
+               reduce_table.add new ReduceAction245(119)
+               reduce_table.add new ReduceAction246(119)
+               reduce_table.add new ReduceAction247(119)
+               reduce_table.add new ReduceAction248(119)
+               reduce_table.add new ReduceAction249(119)
+               reduce_table.add new ReduceAction402(120)
+               reduce_table.add new ReduceAction403(120)
+               reduce_table.add new ReduceAction407(121)
+               reduce_table.add new ReduceAction408(121)
+               reduce_table.add new ReduceAction409(121)
+               reduce_table.add new ReduceAction410(121)
+               reduce_table.add new ReduceAction411(121)
+               reduce_table.add new ReduceAction412(121)
+               reduce_table.add new ReduceAction413(121)
+               reduce_table.add new ReduceAction414(121)
+               reduce_table.add new ReduceAction415(121)
+               reduce_table.add new ReduceAction416(121)
+               reduce_table.add new ReduceAction417(121)
+               reduce_table.add new ReduceAction418(121)
+               reduce_table.add new ReduceAction419(121)
+               reduce_table.add new ReduceAction420(121)
+               reduce_table.add new ReduceAction421(121)
+               reduce_table.add new ReduceAction422(121)
+               reduce_table.add new ReduceAction423(121)
+               reduce_table.add new ReduceAction424(121)
+               reduce_table.add new ReduceAction425(121)
+               reduce_table.add new ReduceAction426(121)
+               reduce_table.add new ReduceAction427(121)
+               reduce_table.add new ReduceAction428(121)
+               reduce_table.add new ReduceAction945(122)
+               reduce_table.add new ReduceAction946(122)
+               reduce_table.add new ReduceAction947(122)
+               reduce_table.add new ReduceAction946(122)
+               reduce_table.add new ReduceAction467(123)
+               reduce_table.add new ReduceAction468(123)
+               reduce_table.add new ReduceAction468(123)
+               reduce_table.add new ReduceAction470(124)
+               reduce_table.add new ReduceAction471(124)
+               reduce_table.add new ReduceAction483(125)
+               reduce_table.add new ReduceAction637(125)
+               reduce_table.add new ReduceAction483(126)
+               reduce_table.add new ReduceAction639(126)
+               reduce_table.add new ReduceAction640(126)
+               reduce_table.add new ReduceAction641(126)
+               reduce_table.add new ReduceAction642(126)
+               reduce_table.add new ReduceAction483(127)
+               reduce_table.add new ReduceAction644(127)
+               reduce_table.add new ReduceAction483(128)
+               reduce_table.add new ReduceAction646(128)
+               reduce_table.add new ReduceAction647(128)
+               reduce_table.add new ReduceAction648(128)
+               reduce_table.add new ReduceAction649(128)
+               reduce_table.add new ReduceAction650(128)
+               reduce_table.add new ReduceAction651(128)
+               reduce_table.add new ReduceAction652(128)
+               reduce_table.add new ReduceAction653(128)
+               reduce_table.add new ReduceAction483(129)
+               reduce_table.add new ReduceAction655(129)
+               reduce_table.add new ReduceAction483(130)
+               reduce_table.add new ReduceAction657(130)
+               reduce_table.add new ReduceAction483(131)
+               reduce_table.add new ReduceAction659(131)
+               reduce_table.add new ReduceAction483(132)
+               reduce_table.add new ReduceAction661(132)
+               reduce_table.add new ReduceAction662(132)
+               reduce_table.add new ReduceAction483(133)
+               reduce_table.add new ReduceAction664(133)
+               reduce_table.add new ReduceAction665(133)
+               reduce_table.add new ReduceAction483(134)
+               reduce_table.add new ReduceAction667(134)
+               reduce_table.add new ReduceAction668(134)
+               reduce_table.add new ReduceAction669(134)
+               reduce_table.add new ReduceAction483(135)
+               reduce_table.add new ReduceAction671(135)
+               reduce_table.add new ReduceAction483(136)
+               reduce_table.add new ReduceAction673(136)
+               reduce_table.add new ReduceAction674(136)
+               reduce_table.add new ReduceAction675(136)
+               reduce_table.add new ReduceAction676(136)
+               reduce_table.add new ReduceAction483(137)
+               reduce_table.add new ReduceAction678(137)
+               reduce_table.add new ReduceAction679(137)
+               reduce_table.add new ReduceAction680(137)
+               reduce_table.add new ReduceAction681(137)
+               reduce_table.add new ReduceAction682(137)
+               reduce_table.add new ReduceAction683(137)
+               reduce_table.add new ReduceAction691(137)
+               reduce_table.add new ReduceAction699(137)
+               reduce_table.add new ReduceAction684(137)
+               reduce_table.add new ReduceAction692(137)
+               reduce_table.add new ReduceAction700(137)
+               reduce_table.add new ReduceAction685(137)
+               reduce_table.add new ReduceAction693(137)
+               reduce_table.add new ReduceAction701(137)
+               reduce_table.add new ReduceAction686(137)
+               reduce_table.add new ReduceAction694(137)
+               reduce_table.add new ReduceAction702(137)
+               reduce_table.add new ReduceAction687(137)
+               reduce_table.add new ReduceAction695(137)
+               reduce_table.add new ReduceAction703(137)
+               reduce_table.add new ReduceAction688(137)
+               reduce_table.add new ReduceAction696(137)
+               reduce_table.add new ReduceAction704(137)
+               reduce_table.add new ReduceAction689(137)
+               reduce_table.add new ReduceAction697(137)
+               reduce_table.add new ReduceAction705(137)
+               reduce_table.add new ReduceAction690(137)
+               reduce_table.add new ReduceAction698(137)
+               reduce_table.add new ReduceAction706(137)
+               reduce_table.add new ReduceAction483(138)
+               reduce_table.add new ReduceAction708(138)
+               reduce_table.add new ReduceAction709(138)
+               reduce_table.add new ReduceAction710(138)
+               reduce_table.add new ReduceAction506(138)
+               reduce_table.add new ReduceAction510(138)
+               reduce_table.add new ReduceAction514(138)
+               reduce_table.add new ReduceAction712(138)
+               reduce_table.add new ReduceAction720(138)
+               reduce_table.add new ReduceAction728(138)
+               reduce_table.add new ReduceAction507(138)
+               reduce_table.add new ReduceAction511(138)
+               reduce_table.add new ReduceAction515(138)
+               reduce_table.add new ReduceAction714(138)
+               reduce_table.add new ReduceAction722(138)
+               reduce_table.add new ReduceAction730(138)
+               reduce_table.add new ReduceAction508(138)
+               reduce_table.add new ReduceAction512(138)
+               reduce_table.add new ReduceAction516(138)
+               reduce_table.add new ReduceAction716(138)
+               reduce_table.add new ReduceAction724(138)
+               reduce_table.add new ReduceAction732(138)
+               reduce_table.add new ReduceAction509(138)
+               reduce_table.add new ReduceAction513(138)
+               reduce_table.add new ReduceAction517(138)
+               reduce_table.add new ReduceAction718(138)
+               reduce_table.add new ReduceAction726(138)
+               reduce_table.add new ReduceAction734(138)
+               reduce_table.add new ReduceAction518(138)
+               reduce_table.add new ReduceAction736(138)
+               reduce_table.add new ReduceAction519(138)
+               reduce_table.add new ReduceAction520(138)
+               reduce_table.add new ReduceAction521(138)
+               reduce_table.add new ReduceAction738(138)
+               reduce_table.add new ReduceAction740(138)
+               reduce_table.add new ReduceAction742(138)
+               reduce_table.add new ReduceAction744(138)
+               reduce_table.add new ReduceAction745(138)
+               reduce_table.add new ReduceAction746(138)
+               reduce_table.add new ReduceAction747(138)
+               reduce_table.add new ReduceAction748(138)
+               reduce_table.add new ReduceAction749(138)
+               reduce_table.add new ReduceAction750(138)
+               reduce_table.add new ReduceAction751(138)
+               reduce_table.add new ReduceAction752(138)
+               reduce_table.add new ReduceAction753(138)
+               reduce_table.add new ReduceAction754(138)
+               reduce_table.add new ReduceAction483(139)
+               reduce_table.add new ReduceAction756(139)
+               reduce_table.add new ReduceAction757(139)
+               reduce_table.add new ReduceAction758(140)
+               reduce_table.add new ReduceAction759(140)
+               reduce_table.add new ReduceAction760(140)
+               reduce_table.add new ReduceAction761(140)
+               reduce_table.add new ReduceAction762(140)
+               reduce_table.add new ReduceAction763(140)
+               reduce_table.add new ReduceAction764(140)
+               reduce_table.add new ReduceAction765(140)
+               reduce_table.add new ReduceAction483(140)
+               reduce_table.add new ReduceAction767(140)
+               reduce_table.add new ReduceAction768(140)
+               reduce_table.add new ReduceAction769(140)
+               reduce_table.add new ReduceAction483(140)
+               reduce_table.add new ReduceAction467(141)
+               reduce_table.add new ReduceAction468(141)
+               reduce_table.add new ReduceAction468(141)
+               reduce_table.add new ReduceAction470(142)
+               reduce_table.add new ReduceAction471(142)
+               reduce_table.add new ReduceAction472(142)
+               reduce_table.add new ReduceAction473(142)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction491(143)
+               reduce_table.add new ReduceAction492(143)
+               reduce_table.add new ReduceAction493(143)
+               reduce_table.add new ReduceAction494(143)
+               reduce_table.add new ReduceAction495(143)
+               reduce_table.add new ReduceAction496(143)
+               reduce_table.add new ReduceAction497(143)
+               reduce_table.add new ReduceAction498(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction483(143)
+               reduce_table.add new ReduceAction506(143)
+               reduce_table.add new ReduceAction507(143)
+               reduce_table.add new ReduceAction508(143)
+               reduce_table.add new ReduceAction509(143)
+               reduce_table.add new ReduceAction510(143)
+               reduce_table.add new ReduceAction511(143)
+               reduce_table.add new ReduceAction512(143)
+               reduce_table.add new ReduceAction513(143)
+               reduce_table.add new ReduceAction514(143)
+               reduce_table.add new ReduceAction515(143)
+               reduce_table.add new ReduceAction516(143)
+               reduce_table.add new ReduceAction517(143)
+               reduce_table.add new ReduceAction518(143)
+               reduce_table.add new ReduceAction519(143)
+               reduce_table.add new ReduceAction520(143)
+               reduce_table.add new ReduceAction521(143)
+               reduce_table.add new ReduceAction522(143)
+               reduce_table.add new ReduceAction523(143)
+               reduce_table.add new ReduceAction522(143)
+               reduce_table.add new ReduceAction525(143)
+               reduce_table.add new ReduceAction526(143)
+               reduce_table.add new ReduceAction525(143)
+               reduce_table.add new ReduceAction528(143)
+               reduce_table.add new ReduceAction529(143)
+               reduce_table.add new ReduceAction528(143)
+               reduce_table.add new ReduceAction531(143)
+               reduce_table.add new ReduceAction538(144)
+               reduce_table.add new ReduceAction539(144)
+               reduce_table.add new ReduceAction540(144)
+               reduce_table.add new ReduceAction541(144)
+               reduce_table.add new ReduceAction542(144)
+               reduce_table.add new ReduceAction543(144)
+               reduce_table.add new ReduceAction544(144)
+               reduce_table.add new ReduceAction545(144)
+               reduce_table.add new ReduceAction546(144)
+               reduce_table.add new ReduceAction547(144)
+               reduce_table.add new ReduceAction548(144)
+               reduce_table.add new ReduceAction549(144)
+               reduce_table.add new ReduceAction550(144)
+               reduce_table.add new ReduceAction551(144)
+               reduce_table.add new ReduceAction552(144)
+               reduce_table.add new ReduceAction553(144)
+               reduce_table.add new ReduceAction554(144)
+               reduce_table.add new ReduceAction555(144)
+               reduce_table.add new ReduceAction556(144)
+               reduce_table.add new ReduceAction557(144)
+               reduce_table.add new ReduceAction558(144)
+               reduce_table.add new ReduceAction559(144)
+               reduce_table.add new ReduceAction560(144)
+               reduce_table.add new ReduceAction561(144)
+               reduce_table.add new ReduceAction562(144)
+               reduce_table.add new ReduceAction563(144)
+               reduce_table.add new ReduceAction564(144)
+               reduce_table.add new ReduceAction565(144)
+               reduce_table.add new ReduceAction566(144)
+               reduce_table.add new ReduceAction567(144)
+               reduce_table.add new ReduceAction568(144)
+               reduce_table.add new ReduceAction569(144)
+               reduce_table.add new ReduceAction570(144)
+               reduce_table.add new ReduceAction571(144)
+               reduce_table.add new ReduceAction572(144)
+               reduce_table.add new ReduceAction573(144)
+               reduce_table.add new ReduceAction574(144)
+               reduce_table.add new ReduceAction575(144)
+               reduce_table.add new ReduceAction576(144)
+               reduce_table.add new ReduceAction577(144)
+               reduce_table.add new ReduceAction578(144)
+               reduce_table.add new ReduceAction579(144)
+               reduce_table.add new ReduceAction580(144)
+               reduce_table.add new ReduceAction581(144)
+               reduce_table.add new ReduceAction582(144)
+               reduce_table.add new ReduceAction583(144)
+               reduce_table.add new ReduceAction584(144)
+               reduce_table.add new ReduceAction585(144)
+               reduce_table.add new ReduceAction586(144)
+               reduce_table.add new ReduceAction587(144)
+               reduce_table.add new ReduceAction588(144)
+               reduce_table.add new ReduceAction589(144)
+               reduce_table.add new ReduceAction590(144)
+               reduce_table.add new ReduceAction591(144)
+               reduce_table.add new ReduceAction592(144)
+               reduce_table.add new ReduceAction593(144)
+               reduce_table.add new ReduceAction483(145)
+               reduce_table.add new ReduceAction637(145)
+               reduce_table.add new ReduceAction483(146)
+               reduce_table.add new ReduceAction639(146)
+               reduce_table.add new ReduceAction640(146)
+               reduce_table.add new ReduceAction641(146)
+               reduce_table.add new ReduceAction642(146)
+               reduce_table.add new ReduceAction483(147)
+               reduce_table.add new ReduceAction644(147)
+               reduce_table.add new ReduceAction483(148)
+               reduce_table.add new ReduceAction646(148)
+               reduce_table.add new ReduceAction647(148)
+               reduce_table.add new ReduceAction648(148)
+               reduce_table.add new ReduceAction649(148)
+               reduce_table.add new ReduceAction650(148)
+               reduce_table.add new ReduceAction651(148)
+               reduce_table.add new ReduceAction652(148)
+               reduce_table.add new ReduceAction653(148)
+               reduce_table.add new ReduceAction483(149)
+               reduce_table.add new ReduceAction655(149)
+               reduce_table.add new ReduceAction483(150)
+               reduce_table.add new ReduceAction657(150)
+               reduce_table.add new ReduceAction483(151)
+               reduce_table.add new ReduceAction659(151)
+               reduce_table.add new ReduceAction483(152)
+               reduce_table.add new ReduceAction661(152)
+               reduce_table.add new ReduceAction662(152)
+               reduce_table.add new ReduceAction483(153)
+               reduce_table.add new ReduceAction664(153)
+               reduce_table.add new ReduceAction665(153)
+               reduce_table.add new ReduceAction483(154)
+               reduce_table.add new ReduceAction667(154)
+               reduce_table.add new ReduceAction668(154)
+               reduce_table.add new ReduceAction669(154)
+               reduce_table.add new ReduceAction483(155)
+               reduce_table.add new ReduceAction671(155)
+               reduce_table.add new ReduceAction483(156)
+               reduce_table.add new ReduceAction673(156)
+               reduce_table.add new ReduceAction674(156)
+               reduce_table.add new ReduceAction675(156)
+               reduce_table.add new ReduceAction676(156)
+               reduce_table.add new ReduceAction483(157)
+               reduce_table.add new ReduceAction678(157)
+               reduce_table.add new ReduceAction679(157)
+               reduce_table.add new ReduceAction680(157)
+               reduce_table.add new ReduceAction681(157)
+               reduce_table.add new ReduceAction682(157)
+               reduce_table.add new ReduceAction683(157)
+               reduce_table.add new ReduceAction684(157)
+               reduce_table.add new ReduceAction685(157)
+               reduce_table.add new ReduceAction686(157)
+               reduce_table.add new ReduceAction687(157)
+               reduce_table.add new ReduceAction688(157)
+               reduce_table.add new ReduceAction689(157)
+               reduce_table.add new ReduceAction690(157)
+               reduce_table.add new ReduceAction691(157)
+               reduce_table.add new ReduceAction692(157)
+               reduce_table.add new ReduceAction693(157)
+               reduce_table.add new ReduceAction694(157)
+               reduce_table.add new ReduceAction695(157)
+               reduce_table.add new ReduceAction696(157)
+               reduce_table.add new ReduceAction697(157)
+               reduce_table.add new ReduceAction698(157)
+               reduce_table.add new ReduceAction699(157)
+               reduce_table.add new ReduceAction700(157)
+               reduce_table.add new ReduceAction701(157)
+               reduce_table.add new ReduceAction702(157)
+               reduce_table.add new ReduceAction703(157)
+               reduce_table.add new ReduceAction704(157)
+               reduce_table.add new ReduceAction705(157)
+               reduce_table.add new ReduceAction706(157)
+               reduce_table.add new ReduceAction483(158)
+               reduce_table.add new ReduceAction708(158)
+               reduce_table.add new ReduceAction709(158)
+               reduce_table.add new ReduceAction710(158)
+               reduce_table.add new ReduceAction506(158)
+               reduce_table.add new ReduceAction712(158)
+               reduce_table.add new ReduceAction507(158)
+               reduce_table.add new ReduceAction714(158)
+               reduce_table.add new ReduceAction508(158)
+               reduce_table.add new ReduceAction716(158)
+               reduce_table.add new ReduceAction509(158)
+               reduce_table.add new ReduceAction718(158)
+               reduce_table.add new ReduceAction510(158)
+               reduce_table.add new ReduceAction720(158)
+               reduce_table.add new ReduceAction511(158)
+               reduce_table.add new ReduceAction722(158)
+               reduce_table.add new ReduceAction512(158)
+               reduce_table.add new ReduceAction724(158)
+               reduce_table.add new ReduceAction513(158)
+               reduce_table.add new ReduceAction726(158)
+               reduce_table.add new ReduceAction514(158)
+               reduce_table.add new ReduceAction728(158)
+               reduce_table.add new ReduceAction515(158)
+               reduce_table.add new ReduceAction730(158)
+               reduce_table.add new ReduceAction516(158)
+               reduce_table.add new ReduceAction732(158)
+               reduce_table.add new ReduceAction517(158)
+               reduce_table.add new ReduceAction734(158)
+               reduce_table.add new ReduceAction518(158)
+               reduce_table.add new ReduceAction736(158)
+               reduce_table.add new ReduceAction519(158)
+               reduce_table.add new ReduceAction738(158)
+               reduce_table.add new ReduceAction520(158)
+               reduce_table.add new ReduceAction740(158)
+               reduce_table.add new ReduceAction521(158)
+               reduce_table.add new ReduceAction742(158)
+               reduce_table.add new ReduceAction743(158)
+               reduce_table.add new ReduceAction744(158)
+               reduce_table.add new ReduceAction745(158)
+               reduce_table.add new ReduceAction746(158)
+               reduce_table.add new ReduceAction747(158)
+               reduce_table.add new ReduceAction748(158)
+               reduce_table.add new ReduceAction749(158)
+               reduce_table.add new ReduceAction750(158)
+               reduce_table.add new ReduceAction751(158)
+               reduce_table.add new ReduceAction752(158)
+               reduce_table.add new ReduceAction753(158)
+               reduce_table.add new ReduceAction754(158)
+               reduce_table.add new ReduceAction483(159)
+               reduce_table.add new ReduceAction756(159)
+               reduce_table.add new ReduceAction757(159)
+               reduce_table.add new ReduceAction758(160)
+               reduce_table.add new ReduceAction759(160)
+               reduce_table.add new ReduceAction760(160)
+               reduce_table.add new ReduceAction761(160)
+               reduce_table.add new ReduceAction762(160)
+               reduce_table.add new ReduceAction763(160)
+               reduce_table.add new ReduceAction764(160)
+               reduce_table.add new ReduceAction765(160)
+               reduce_table.add new ReduceAction483(160)
+               reduce_table.add new ReduceAction767(160)
+               reduce_table.add new ReduceAction768(160)
+               reduce_table.add new ReduceAction769(160)
+               reduce_table.add new ReduceAction793(161)
+               reduce_table.add new ReduceAction794(161)
+               reduce_table.add new ReduceAction795(162)
+               reduce_table.add new ReduceAction49(162)
+               reduce_table.add new ReduceAction797(163)
+               reduce_table.add new ReduceAction798(163)
+               reduce_table.add new ReduceAction799(163)
+               reduce_table.add new ReduceAction800(163)
+               reduce_table.add new ReduceAction801(163)
+               reduce_table.add new ReduceAction802(163)
+               reduce_table.add new ReduceAction803(163)
+               reduce_table.add new ReduceAction804(163)
+               reduce_table.add new ReduceAction805(163)
+               reduce_table.add new ReduceAction806(163)
+               reduce_table.add new ReduceAction797(164)
+               reduce_table.add new ReduceAction798(164)
+               reduce_table.add new ReduceAction799(164)
+               reduce_table.add new ReduceAction800(164)
+               reduce_table.add new ReduceAction801(164)
+               reduce_table.add new ReduceAction802(164)
+               reduce_table.add new ReduceAction803(164)
+               reduce_table.add new ReduceAction804(164)
+               reduce_table.add new ReduceAction805(164)
+               reduce_table.add new ReduceAction806(164)
+               reduce_table.add new ReduceAction778(165)
+               reduce_table.add new ReduceAction779(165)
+               reduce_table.add new ReduceAction909(166)
+               reduce_table.add new ReduceAction483(166)
+               reduce_table.add new ReduceAction483(166)
+               reduce_table.add new ReduceAction912(166)
+               reduce_table.add new ReduceAction913(166)
+               reduce_table.add new ReduceAction914(166)
+               reduce_table.add new ReduceAction467(167)
+               reduce_table.add new ReduceAction468(167)
+               reduce_table.add new ReduceAction468(167)
+               reduce_table.add new ReduceAction470(168)
+               reduce_table.add new ReduceAction471(168)
+               reduce_table.add new ReduceAction483(169)
+               reduce_table.add new ReduceAction637(169)
+               reduce_table.add new ReduceAction483(170)
+               reduce_table.add new ReduceAction639(170)
+               reduce_table.add new ReduceAction640(170)
+               reduce_table.add new ReduceAction641(170)
+               reduce_table.add new ReduceAction642(170)
+               reduce_table.add new ReduceAction483(171)
+               reduce_table.add new ReduceAction644(171)
+               reduce_table.add new ReduceAction483(172)
+               reduce_table.add new ReduceAction646(172)
+               reduce_table.add new ReduceAction647(172)
+               reduce_table.add new ReduceAction648(172)
+               reduce_table.add new ReduceAction649(172)
+               reduce_table.add new ReduceAction650(172)
+               reduce_table.add new ReduceAction651(172)
+               reduce_table.add new ReduceAction652(172)
+               reduce_table.add new ReduceAction653(172)
+               reduce_table.add new ReduceAction483(173)
+               reduce_table.add new ReduceAction655(173)
+               reduce_table.add new ReduceAction483(174)
+               reduce_table.add new ReduceAction657(174)
+               reduce_table.add new ReduceAction483(175)
+               reduce_table.add new ReduceAction659(175)
+               reduce_table.add new ReduceAction483(176)
+               reduce_table.add new ReduceAction661(176)
+               reduce_table.add new ReduceAction662(176)
+               reduce_table.add new ReduceAction483(177)
+               reduce_table.add new ReduceAction664(177)
+               reduce_table.add new ReduceAction665(177)
+               reduce_table.add new ReduceAction483(178)
+               reduce_table.add new ReduceAction667(178)
+               reduce_table.add new ReduceAction668(178)
+               reduce_table.add new ReduceAction669(178)
+               reduce_table.add new ReduceAction483(179)
+               reduce_table.add new ReduceAction671(179)
+               reduce_table.add new ReduceAction483(180)
+               reduce_table.add new ReduceAction673(180)
+               reduce_table.add new ReduceAction674(180)
+               reduce_table.add new ReduceAction675(180)
+               reduce_table.add new ReduceAction676(180)
+               reduce_table.add new ReduceAction483(181)
+               reduce_table.add new ReduceAction678(181)
+               reduce_table.add new ReduceAction679(181)
+               reduce_table.add new ReduceAction1511(181)
+               reduce_table.add new ReduceAction1512(181)
+               reduce_table.add new ReduceAction1513(181)
+               reduce_table.add new ReduceAction1514(181)
+               reduce_table.add new ReduceAction1515(181)
+               reduce_table.add new ReduceAction1516(181)
+               reduce_table.add new ReduceAction1517(181)
+               reduce_table.add new ReduceAction1518(181)
+               reduce_table.add new ReduceAction1519(181)
+               reduce_table.add new ReduceAction483(182)
+               reduce_table.add new ReduceAction1521(182)
+               reduce_table.add new ReduceAction1522(182)
+               reduce_table.add new ReduceAction1523(182)
+               reduce_table.add new ReduceAction1524(182)
+               reduce_table.add new ReduceAction1525(182)
+               reduce_table.add new ReduceAction1526(182)
+               reduce_table.add new ReduceAction1527(182)
+               reduce_table.add new ReduceAction1528(182)
+               reduce_table.add new ReduceAction1529(182)
+               reduce_table.add new ReduceAction518(182)
+               reduce_table.add new ReduceAction736(182)
+               reduce_table.add new ReduceAction1532(182)
+               reduce_table.add new ReduceAction1533(182)
+               reduce_table.add new ReduceAction744(182)
+               reduce_table.add new ReduceAction745(182)
+               reduce_table.add new ReduceAction746(182)
+               reduce_table.add new ReduceAction747(182)
+               reduce_table.add new ReduceAction748(182)
+               reduce_table.add new ReduceAction749(182)
+               reduce_table.add new ReduceAction750(182)
+               reduce_table.add new ReduceAction751(182)
+               reduce_table.add new ReduceAction752(182)
+               reduce_table.add new ReduceAction753(182)
+               reduce_table.add new ReduceAction754(182)
+               reduce_table.add new ReduceAction483(183)
+               reduce_table.add new ReduceAction756(183)
+               reduce_table.add new ReduceAction757(183)
+               reduce_table.add new ReduceAction758(184)
+               reduce_table.add new ReduceAction759(184)
+               reduce_table.add new ReduceAction760(184)
+               reduce_table.add new ReduceAction761(184)
+               reduce_table.add new ReduceAction762(184)
+               reduce_table.add new ReduceAction763(184)
+               reduce_table.add new ReduceAction764(184)
+               reduce_table.add new ReduceAction765(184)
+               reduce_table.add new ReduceAction483(184)
+               reduce_table.add new ReduceAction767(184)
+               reduce_table.add new ReduceAction768(184)
+               reduce_table.add new ReduceAction769(184)
+               reduce_table.add new ReduceAction1560(185)
+               reduce_table.add new ReduceAction1561(185)
+               reduce_table.add new ReduceAction1562(185)
+               reduce_table.add new ReduceAction480(186)
+               reduce_table.add new ReduceAction481(186)
+               reduce_table.add new ReduceAction482(186)
+               reduce_table.add new ReduceAction483(186)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction491(187)
+               reduce_table.add new ReduceAction492(187)
+               reduce_table.add new ReduceAction493(187)
+               reduce_table.add new ReduceAction494(187)
+               reduce_table.add new ReduceAction495(187)
+               reduce_table.add new ReduceAction496(187)
+               reduce_table.add new ReduceAction497(187)
+               reduce_table.add new ReduceAction498(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction483(187)
+               reduce_table.add new ReduceAction506(187)
+               reduce_table.add new ReduceAction507(187)
+               reduce_table.add new ReduceAction508(187)
+               reduce_table.add new ReduceAction509(187)
+               reduce_table.add new ReduceAction510(187)
+               reduce_table.add new ReduceAction511(187)
+               reduce_table.add new ReduceAction512(187)
+               reduce_table.add new ReduceAction513(187)
+               reduce_table.add new ReduceAction514(187)
+               reduce_table.add new ReduceAction515(187)
+               reduce_table.add new ReduceAction516(187)
+               reduce_table.add new ReduceAction517(187)
+               reduce_table.add new ReduceAction518(187)
+               reduce_table.add new ReduceAction519(187)
+               reduce_table.add new ReduceAction520(187)
+               reduce_table.add new ReduceAction521(187)
+               reduce_table.add new ReduceAction522(187)
+               reduce_table.add new ReduceAction523(187)
+               reduce_table.add new ReduceAction522(187)
+               reduce_table.add new ReduceAction525(187)
+               reduce_table.add new ReduceAction526(187)
+               reduce_table.add new ReduceAction525(187)
+               reduce_table.add new ReduceAction528(187)
+               reduce_table.add new ReduceAction529(187)
+               reduce_table.add new ReduceAction528(187)
+               reduce_table.add new ReduceAction531(187)
+               reduce_table.add new ReduceAction605(188)
+               reduce_table.add new ReduceAction606(188)
+               reduce_table.add new ReduceAction607(188)
+               reduce_table.add new ReduceAction608(189)
+               reduce_table.add new ReduceAction617(190)
+               reduce_table.add new ReduceAction618(190)
+               reduce_table.add new ReduceAction619(191)
+               reduce_table.add new ReduceAction620(191)
+               reduce_table.add new ReduceAction621(192)
+               reduce_table.add new ReduceAction622(192)
+               reduce_table.add new ReduceAction626(193)
+               reduce_table.add new ReduceAction627(193)
+               reduce_table.add new ReduceAction631(194)
+               reduce_table.add new ReduceAction632(194)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction491(195)
+               reduce_table.add new ReduceAction492(195)
+               reduce_table.add new ReduceAction493(195)
+               reduce_table.add new ReduceAction494(195)
+               reduce_table.add new ReduceAction495(195)
+               reduce_table.add new ReduceAction496(195)
+               reduce_table.add new ReduceAction497(195)
+               reduce_table.add new ReduceAction498(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction483(195)
+               reduce_table.add new ReduceAction506(195)
+               reduce_table.add new ReduceAction507(195)
+               reduce_table.add new ReduceAction508(195)
+               reduce_table.add new ReduceAction509(195)
+               reduce_table.add new ReduceAction510(195)
+               reduce_table.add new ReduceAction511(195)
+               reduce_table.add new ReduceAction512(195)
+               reduce_table.add new ReduceAction513(195)
+               reduce_table.add new ReduceAction514(195)
+               reduce_table.add new ReduceAction515(195)
+               reduce_table.add new ReduceAction516(195)
+               reduce_table.add new ReduceAction517(195)
+               reduce_table.add new ReduceAction518(195)
+               reduce_table.add new ReduceAction519(195)
+               reduce_table.add new ReduceAction520(195)
+               reduce_table.add new ReduceAction521(195)
+               reduce_table.add new ReduceAction522(195)
+               reduce_table.add new ReduceAction523(195)
+               reduce_table.add new ReduceAction522(195)
+               reduce_table.add new ReduceAction525(195)
+               reduce_table.add new ReduceAction526(195)
+               reduce_table.add new ReduceAction525(195)
+               reduce_table.add new ReduceAction528(195)
+               reduce_table.add new ReduceAction529(195)
+               reduce_table.add new ReduceAction528(195)
+               reduce_table.add new ReduceAction531(195)
+               reduce_table.add new ReduceAction480(196)
+               reduce_table.add new ReduceAction481(196)
+               reduce_table.add new ReduceAction482(196)
+               reduce_table.add new ReduceAction480(197)
+               reduce_table.add new ReduceAction481(197)
+               reduce_table.add new ReduceAction482(197)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction491(198)
+               reduce_table.add new ReduceAction492(198)
+               reduce_table.add new ReduceAction493(198)
+               reduce_table.add new ReduceAction494(198)
+               reduce_table.add new ReduceAction495(198)
+               reduce_table.add new ReduceAction496(198)
+               reduce_table.add new ReduceAction497(198)
+               reduce_table.add new ReduceAction498(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction483(198)
+               reduce_table.add new ReduceAction531(198)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction491(199)
+               reduce_table.add new ReduceAction492(199)
+               reduce_table.add new ReduceAction493(199)
+               reduce_table.add new ReduceAction494(199)
+               reduce_table.add new ReduceAction495(199)
+               reduce_table.add new ReduceAction496(199)
+               reduce_table.add new ReduceAction497(199)
+               reduce_table.add new ReduceAction498(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction483(199)
+               reduce_table.add new ReduceAction531(199)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction491(200)
+               reduce_table.add new ReduceAction492(200)
+               reduce_table.add new ReduceAction493(200)
+               reduce_table.add new ReduceAction494(200)
+               reduce_table.add new ReduceAction495(200)
+               reduce_table.add new ReduceAction496(200)
+               reduce_table.add new ReduceAction497(200)
+               reduce_table.add new ReduceAction498(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction483(200)
+               reduce_table.add new ReduceAction531(200)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction491(201)
+               reduce_table.add new ReduceAction492(201)
+               reduce_table.add new ReduceAction493(201)
+               reduce_table.add new ReduceAction494(201)
+               reduce_table.add new ReduceAction495(201)
+               reduce_table.add new ReduceAction496(201)
+               reduce_table.add new ReduceAction497(201)
+               reduce_table.add new ReduceAction498(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction483(201)
+               reduce_table.add new ReduceAction531(201)
+               reduce_table.add new ReduceAction916(202)
+               reduce_table.add new ReduceAction918(202)
+               reduce_table.add new ReduceAction956(203)
+               reduce_table.add new ReduceAction957(203)
+               reduce_table.add new ReduceAction50(203)
+               reduce_table.add new ReduceAction1746(204)
+               reduce_table.add new ReduceAction1747(204)
+               reduce_table.add new ReduceAction1748(205)
+               reduce_table.add new ReduceAction1749(205)
+               reduce_table.add new ReduceAction1750(206)
+               reduce_table.add new ReduceAction1751(206)
+               reduce_table.add new ReduceAction100(207)
+               reduce_table.add new ReduceAction1753(207)
+               reduce_table.add new ReduceAction117(208)
+               reduce_table.add new ReduceAction1755(208)
+               reduce_table.add new ReduceAction817(209)
+               reduce_table.add new ReduceAction1757(209)
+               reduce_table.add new ReduceAction1758(210)
+               reduce_table.add new ReduceAction1759(210)
+               reduce_table.add new ReduceAction1760(211)
+               reduce_table.add new ReduceAction1761(211)
+               reduce_table.add new ReduceAction474(212)
+               reduce_table.add new ReduceAction1763(212)
+               reduce_table.add new ReduceAction778(213)
+               reduce_table.add new ReduceAction1765(213)
+               reduce_table.add new ReduceAction778(214)
+               reduce_table.add new ReduceAction1765(214)
+               reduce_table.add new ReduceAction778(215)
+               reduce_table.add new ReduceAction1765(215)
+               reduce_table.add new ReduceAction930(216)
+               reduce_table.add new ReduceAction1771(216)
+               reduce_table.add new ReduceAction817(217)
+               reduce_table.add new ReduceAction1757(217)
+               reduce_table.add new ReduceAction778(218)
+               reduce_table.add new ReduceAction1765(218)
+               reduce_table.add new ReduceAction778(219)
+               reduce_table.add new ReduceAction1765(219)
+               reduce_table.add new ReduceAction931(220)
+               reduce_table.add new ReduceAction1779(220)
+               reduce_table.add new ReduceAction1780(221)
+               reduce_table.add new ReduceAction1781(221)
+               reduce_table.add new ReduceAction953(222)
+               reduce_table.add new ReduceAction972(222)
+               return reduce_table
        end
-       var _goto: Int
-       init(g: Int) do _goto = g
 end
 
 private class ReduceAction0
@@ -2053,14 +1803,20 @@ private class ReduceAction0
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pclassdefnode5 = nodearraylist1
+                                       assert pclassdefnode5 isa nullable AClassdef
+                                       if pclassdefnode5 != null then
+                                               listnode6.add(pclassdefnode5)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode4,
-                                               listnode5
+                                               listnode6
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2071,17 +1827,23 @@ private class ReduceAction1
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
+                                       var pclassdefnode5 = nodearraylist2
+                                       assert pclassdefnode5 isa nullable AClassdef
+                                       if pclassdefnode5 != null then
+                                               listnode6.add(pclassdefnode5)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode3,
                                                listnode4,
-                                               listnode5
+                                               listnode6
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2092,18 +1854,24 @@ private class ReduceAction2
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
+                                       var pclassdefnode6 = nodearraylist2
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode5,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2114,21 +1882,27 @@ private class ReduceAction3
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
+                                       var pclassdefnode6 = nodearraylist3
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode4,
                                                listnode5,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2139,18 +1913,24 @@ private class ReduceAction4
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        listnode5 = concat(listnode5, listnode4)
+                                       var pclassdefnode6 = nodearraylist2
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode5,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2161,21 +1941,27 @@ private class ReduceAction5
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        listnode5 = concat(listnode5, listnode4)
+                                       var pclassdefnode6 = nodearraylist3
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode3,
                                                listnode5,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2186,22 +1972,28 @@ private class ReduceAction6
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
                                        var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        listnode6 = concat(listnode6, listnode5)
+                                       var pclassdefnode7 = nodearraylist3
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode6,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2212,12 +2004,13 @@ private class ReduceAction7
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
@@ -2226,11 +2019,16 @@ private class ReduceAction7
                                        var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        listnode6 = concat(listnode6, listnode5)
+                                       var pclassdefnode7 = nodearraylist4
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode4,
                                                listnode6,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2241,18 +2039,24 @@ private class ReduceAction8
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var listnode5 = nodearraylist1
                                        assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
+                                       var pclassdefnode6 = nodearraylist2
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       listnode7 = concat(listnode7, listnode5)
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode4,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2263,21 +2067,27 @@ private class ReduceAction9
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode7 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
+                                       var pclassdefnode6 = nodearraylist3
+                                       assert pclassdefnode6 isa nullable AClassdef
+                                       listnode7 = concat(listnode7, listnode5)
+                                       if pclassdefnode6 != null then
+                                               listnode7.add(pclassdefnode6)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode3,
                                                listnode4,
-                                               listnode6
+                                               listnode7
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2288,22 +2098,28 @@ private class ReduceAction10
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
                                        var listnode6 = nodearraylist2
                                        assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pclassdefnode7 = nodearraylist3
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       listnode8 = concat(listnode8, listnode6)
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode5,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2314,12 +2130,13 @@ private class ReduceAction11
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
@@ -2327,12 +2144,17 @@ private class ReduceAction11
                                        listnode4 = concat(listnode4, listnode3)
                                        var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pclassdefnode7 = nodearraylist4
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       listnode8 = concat(listnode8, listnode6)
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode4,
                                                listnode5,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2343,22 +2165,28 @@ private class ReduceAction12
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        listnode5 = concat(listnode5, listnode4)
                                        var listnode6 = nodearraylist2
                                        assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pclassdefnode7 = nodearraylist3
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       listnode8 = concat(listnode8, listnode6)
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode5,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2369,12 +2197,13 @@ private class ReduceAction13
        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 listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode8 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
@@ -2382,12 +2211,17 @@ private class ReduceAction13
                                        listnode5 = concat(listnode5, listnode4)
                                        var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pclassdefnode7 = nodearraylist4
+                                       assert pclassdefnode7 isa nullable AClassdef
+                                       listnode8 = concat(listnode8, listnode6)
+                                       if pclassdefnode7 != null then
+                                               listnode8.add(pclassdefnode7)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode3,
                                                listnode5,
-                                               listnode7
+                                               listnode8
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2398,12 +2232,13 @@ private class ReduceAction14
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode8 = new Array[Object]
+                                       var listnode9 = new Array[Object]
                                        var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -2412,12 +2247,17 @@ private class ReduceAction14
                                        listnode6 = concat(listnode6, listnode5)
                                        var listnode7 = nodearraylist3
                                        assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var pclassdefnode8 = nodearraylist4
+                                       assert pclassdefnode8 isa nullable AClassdef
+                                       listnode9 = concat(listnode9, listnode7)
+                                       if pclassdefnode8 != null then
+                                               listnode9.add(pclassdefnode8)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode6,
-                                               listnode8
+                                               listnode9
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2428,13 +2268,14 @@ private class ReduceAction15
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode8 = new Array[Object]
+                                       var listnode9 = new Array[Object]
                                        var pmoduledeclnode2 = nodearraylist1
                                        assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
@@ -2445,12 +2286,17 @@ private class ReduceAction15
                                        listnode6 = concat(listnode6, listnode5)
                                        var listnode7 = nodearraylist4
                                        assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var pclassdefnode8 = nodearraylist5
+                                       assert pclassdefnode8 isa nullable AClassdef
+                                       listnode9 = concat(listnode9, listnode7)
+                                       if pclassdefnode8 != null then
+                                               listnode9.add(pclassdefnode8)
+                                       end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                pmoduledeclnode2,
                                                listnode4,
                                                listnode6,
-                                               listnode8
+                                               listnode9
                                        )
                                        node_list = pmodulenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2461,27 +2307,32 @@ private class ReduceAction16
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode6 = nodearraylist1
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode7
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       if pclassdefnode5 != null then
-                                               listnode8.add(pclassdefnode5)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var tkwmodulenode6 = nodearraylist2
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist4
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist5
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
                                                null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode8
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2490,30 +2341,36 @@ private class ReduceAction17
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode7 = new Array[Object]
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode7
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       if pclassdefnode5 != null then
-                                               listnode8.add(pclassdefnode5)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode8
+                                       var tkwmodulenode6 = nodearraylist4
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist6
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2522,31 +2379,36 @@ private class ReduceAction18
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var tkwmodulenode6 = nodearraylist4
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist6
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
                                                null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode9
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2555,34 +2417,36 @@ private class ReduceAction19
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode5,
-                                               listnode9
+                                       var tkwmodulenode6 = nodearraylist4
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist6
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2591,31 +2455,36 @@ private class ReduceAction20
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var tkwmodulenode6 = nodearraylist4
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist6
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
                                                null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode9
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2624,34 +2493,35 @@ private class ReduceAction21
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode9
+                                       var tkwmodulenode6 = nodearraylist3
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist5
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist6
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2660,35 +2530,39 @@ private class ReduceAction22
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
-                                       )
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode10
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmodulenode6 = nodearraylist5
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist7
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2697,38 +2571,39 @@ private class ReduceAction23
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
-                                       )
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode10
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmodulenode6 = nodearraylist5
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist7
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2737,31 +2612,39 @@ private class ReduceAction24
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode5 = nodearraylist1
-                                       assert listnode5 isa Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       listnode9 = concat(listnode9, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode9
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmodulenode6 = nodearraylist5
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist7
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2770,34 +2653,39 @@ private class ReduceAction25
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       listnode9 = concat(listnode9, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode9.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode9
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmodulenode6 = nodearraylist5
+                                       assert tkwmodulenode6 isa nullable TKwmodule
+                                       var pmodulenamenode7 = nodearraylist7
+                                       assert pmodulenamenode7 isa nullable AModuleName
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode6,
+                                               pmodulenamenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2806,35 +2694,28 @@ private class ReduceAction26
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       listnode10 = concat(listnode10, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode10
+                                       var tkwimportnode4 = nodearraylist2
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist4
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist5
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2843,38 +2724,32 @@ private class ReduceAction27
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var tkwpublicnode3 = nodearraylist2
+                                       assert tkwpublicnode3 isa nullable TKwpublic
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode3
                                        )
-                                       listnode10 = concat(listnode10, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode5,
-                                               listnode10
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist6
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist7
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2883,35 +2758,32 @@ private class ReduceAction28
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var tkwprivatenode3 = nodearraylist2
+                                       assert tkwprivatenode3 isa nullable TKwprivate
+                                       var pvisibilitynode2: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode3
                                        )
-                                       listnode10 = concat(listnode10, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode10
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist6
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist7
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2920,38 +2792,32 @@ private class ReduceAction29
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var tkwprotectednode3 = nodearraylist2
+                                       assert tkwprotectednode3 isa nullable TKwprotected
+                                       var pvisibilitynode2: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode3
                                        )
-                                       listnode10 = concat(listnode10, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode10.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode10
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist6
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist7
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -2960,39 +2826,32 @@ private class ReduceAction30
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode9 = nodearraylist4
-                                       assert listnode9 isa Array[Object]
-                                       listnode10 = concat(listnode10, listnode9)
-                                       var pclassdefnode8: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode10
+                                       var tkwintrudenode3 = nodearraylist2
+                                       assert tkwintrudenode3 isa nullable TKwintrude
+                                       var pvisibilitynode2: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode3
                                        )
-                                       listnode11 = concat(listnode11, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode11.add(pclassdefnode8)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode11
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist6
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist7
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3001,42 +2860,29 @@ private class ReduceAction31
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist4
-                                       assert listnode7 isa Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode9 = nodearraylist5
-                                       assert listnode9 isa Array[Object]
-                                       listnode10 = concat(listnode10, listnode9)
-                                       var pclassdefnode8: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode10
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       listnode11 = concat(listnode11, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode11.add(pclassdefnode8)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode11
+                                       var tkwimportnode4 = nodearraylist3
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist5
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist6
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3045,22 +2891,33 @@ private class ReduceAction32
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var pclassdefnode5 = nodearraylist1
-                                       assert pclassdefnode5 isa nullable AClassdef
-                                       if pclassdefnode5 != null then
-                                               listnode6.add(pclassdefnode5)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode6
+                                       var tkwpublicnode3 = nodearraylist3
+                                       assert tkwpublicnode3 isa nullable TKwpublic
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist7
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist8
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3069,25 +2926,33 @@ private class ReduceAction33
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var pclassdefnode5 = nodearraylist2
-                                       assert pclassdefnode5 isa nullable AClassdef
-                                       if pclassdefnode5 != null then
-                                               listnode6.add(pclassdefnode5)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode6
+                                       var tkwprivatenode3 = nodearraylist3
+                                       assert tkwprivatenode3 isa nullable TKwprivate
+                                       var pvisibilitynode2: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist7
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist8
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3096,26 +2961,33 @@ private class ReduceAction34
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pclassdefnode6 = nodearraylist2
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode7
+                                       var tkwprotectednode3 = nodearraylist3
+                                       assert tkwprotectednode3 isa nullable TKwprotected
+                                       var pvisibilitynode2: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist7
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist8
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3124,29 +2996,33 @@ private class ReduceAction35
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pclassdefnode6 = nodearraylist3
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode5,
-                                               listnode7
+                                       var tkwintrudenode3 = nodearraylist3
+                                       assert tkwintrudenode3 isa nullable TKwintrude
+                                       var pvisibilitynode2: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var pmodulenamenode5 = nodearraylist7
+                                       assert pmodulenamenode5 isa nullable AModuleName
+                                       var pannotationsnode6 = nodearraylist8
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               pmodulenamenode5,
+                                               pannotationsnode6
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3155,26 +3031,24 @@ private class ReduceAction36
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pclassdefnode6 = nodearraylist2
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode7
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist2
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist4
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3183,29 +3057,28 @@ private class ReduceAction37
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pclassdefnode6 = nodearraylist3
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode7
+                                       var tkwpublicnode3 = nodearraylist2
+                                       assert tkwpublicnode3 isa nullable TKwpublic
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist6
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3214,30 +3087,28 @@ private class ReduceAction38
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pclassdefnode7 = nodearraylist3
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode8
+                                       var tkwprivatenode3 = nodearraylist2
+                                       assert tkwprivatenode3 isa nullable TKwprivate
+                                       var pvisibilitynode2: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist6
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3246,33 +3117,28 @@ private class ReduceAction39
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pclassdefnode7 = nodearraylist4
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode8
+                                       var tkwprotectednode3 = nodearraylist2
+                                       assert tkwprotectednode3 isa nullable TKwprotected
+                                       var pvisibilitynode2: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist6
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3281,26 +3147,28 @@ private class ReduceAction40
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode5 = nodearraylist1
-                                       assert listnode5 isa Array[Object]
-                                       var pclassdefnode6 = nodearraylist2
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       listnode7 = concat(listnode7, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode7
+                                       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 tkwintrudenode3 = nodearraylist2
+                                       assert tkwintrudenode3 isa nullable TKwintrude
+                                       var pvisibilitynode2: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist4
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist6
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3309,29 +3177,25 @@ private class ReduceAction41
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       var pclassdefnode6 = nodearraylist3
-                                       assert pclassdefnode6 isa nullable AClassdef
-                                       listnode7 = concat(listnode7, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode7.add(pclassdefnode6)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode7
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist3
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist5
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3340,30 +3204,29 @@ private class ReduceAction42
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       var pclassdefnode7 = nodearraylist3
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       listnode8 = concat(listnode8, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode8
+                                       var tkwpublicnode3 = nodearraylist3
+                                       assert tkwpublicnode3 isa nullable TKwpublic
+                                       var pvisibilitynode2: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist7
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3372,33 +3235,29 @@ private class ReduceAction43
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       var pclassdefnode7 = nodearraylist4
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       listnode8 = concat(listnode8, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode5,
-                                               listnode8
+                                       var tkwprivatenode3 = nodearraylist3
+                                       assert tkwprivatenode3 isa nullable TKwprivate
+                                       var pvisibilitynode2: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist7
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3407,30 +3266,29 @@ private class ReduceAction44
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       var pclassdefnode7 = nodearraylist3
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       listnode8 = concat(listnode8, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode8
+                                       var tkwprotectednode3 = nodearraylist3
+                                       assert tkwprotectednode3 isa nullable TKwprotected
+                                       var pvisibilitynode2: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist7
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3439,33 +3297,29 @@ private class ReduceAction45
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       var pclassdefnode7 = nodearraylist4
-                                       assert pclassdefnode7 isa nullable AClassdef
-                                       listnode8 = concat(listnode8, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode8.add(pclassdefnode7)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode8
+                                       var tkwintrudenode3 = nodearraylist3
+                                       assert tkwintrudenode3 isa nullable TKwintrude
+                                       var pvisibilitynode2: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode3
                                        )
-                                       node_list = pmodulenode1
+                                       var tkwimportnode4 = nodearraylist5
+                                       assert tkwimportnode4 isa nullable TKwimport
+                                       var tkwendnode5 = nodearraylist7
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
+                                               pvisibilitynode2,
+                                               tkwimportnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pimportnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3474,34 +3328,9 @@ private class ReduceAction46
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       var pclassdefnode8 = nodearraylist4
-                                       assert pclassdefnode8 isa nullable AClassdef
-                                       listnode9 = concat(listnode9, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode9.add(pclassdefnode8)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode9
-                                       )
-                                       node_list = pmodulenode1
+                                       var pclassdefnode1 = nodearraylist1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3510,37 +3339,18 @@ private class ReduceAction47
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist4
-                                       assert listnode7 isa Array[Object]
-                                       var pclassdefnode8 = nodearraylist5
-                                       assert pclassdefnode8 isa nullable AClassdef
-                                       listnode9 = concat(listnode9, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode9.add(pclassdefnode8)
+                                       var listnode3 = new Array[Object]
+                                       var ppropdefnode2 = nodearraylist1
+                                       assert ppropdefnode2 isa nullable APropdef
+                                       if ppropdefnode2 != null then
+                                               listnode3.add(ppropdefnode2)
                                        end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode9
+                                       var pclassdefnode1: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
+                                               listnode3
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3549,33 +3359,17 @@ private class ReduceAction48
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode6 = nodearraylist1
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode7
-                                       )
-                                       var pclassdefnode8 = nodearraylist2
-                                       assert pclassdefnode8 isa nullable AClassdef
-                                       if pclassdefnode5 != null then
-                                               listnode9.add(pclassdefnode5)
-                                       end
-                                       if pclassdefnode8 != null then
-                                               listnode9.add(pclassdefnode8)
+                                       var ppropdefnode2 = nodearraylist1
+                                       assert ppropdefnode2 isa nullable APropdef
+                                       if ppropdefnode2 != null then
+                                               listnode3.add(ppropdefnode2)
                                        end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode9
+                                       var pclassdefnode1: nullable AMainClassdef = new AMainClassdef.init_amainclassdef(
+                                               listnode3
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3584,36 +3378,7 @@ private class ReduceAction49
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode9 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode7 = new Array[Object]
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode7
-                                       )
-                                       var pclassdefnode8 = nodearraylist3
-                                       assert pclassdefnode8 isa nullable AClassdef
-                                       if pclassdefnode5 != null then
-                                               listnode9.add(pclassdefnode5)
-                                       end
-                                       if pclassdefnode8 != null then
-                                               listnode9.add(pclassdefnode8)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode9
-                                       )
-                                       node_list = pmodulenode1
+                                       node_list = null
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3622,37 +3387,8 @@ private class ReduceAction50
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       var pclassdefnode9 = nodearraylist3
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode10
-                                       )
-                                       node_list = pmodulenode1
+                                       node_list = null
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3661,40 +3397,23 @@ private class ReduceAction51
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       var pclassdefnode9 = nodearraylist4
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
                                        end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode5,
-                                               listnode10
+                                               null
                                        )
-                                       node_list = pmodulenode1
+                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
+                                               null,
+                                               pexprnode3
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3706,34 +3425,24 @@ private class ReduceAction52
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       var pclassdefnode9 = nodearraylist3
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       if pexprnode4 != null then
+                                               listnode6.add(pexprnode4)
                                        end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6,
+                                               null
+                                       )
+                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
                                                null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode10
+                                               pexprnode3
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3742,40 +3451,15 @@ private class ReduceAction53
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
-                                       )
-                                       var pclassdefnode9 = nodearraylist4
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode10
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
+                                               null,
+                                               pexprnode3
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3784,41 +3468,42 @@ private class ReduceAction54
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       var pclassdefnode10 = nodearraylist4
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var pclasskindnode6 = nodearraylist2
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist4
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist5
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist6
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
                                                null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode11
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3827,44 +3512,46 @@ private class ReduceAction55
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var pclassdefnode10 = nodearraylist5
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode11
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist7
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3873,37 +3560,46 @@ private class ReduceAction56
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode5 = nodearraylist1
-                                       assert listnode5 isa Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist2
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pclassdefnode9 = nodearraylist3
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       listnode10 = concat(listnode10, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist7
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
                                                null,
-                                               listnode3,
-                                               listnode4,
-                                               listnode10
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3912,40 +3608,46 @@ private class ReduceAction57
        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 listnode3 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode8
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pclassdefnode9 = nodearraylist4
-                                       assert pclassdefnode9 isa nullable AClassdef
-                                       listnode10 = concat(listnode10, listnode5)
-                                       if pclassdefnode6 != null then
-                                               listnode10.add(pclassdefnode6)
-                                       end
-                                       if pclassdefnode9 != null then
-                                               listnode10.add(pclassdefnode9)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode4,
-                                               listnode10
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist7
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3954,41 +3656,46 @@ private class ReduceAction58
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pclassdefnode10 = nodearraylist4
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       listnode11 = concat(listnode11, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist7
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
                                                null,
-                                               listnode4,
-                                               listnode5,
-                                               listnode11
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -3997,44 +3704,45 @@ private class ReduceAction59
        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 listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       var pclassdefnode10 = nodearraylist5
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       listnode11 = concat(listnode11, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode5,
-                                               listnode11
+                                       var pclasskindnode6 = nodearraylist3
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist6
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist7
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4043,41 +3751,49 @@ private class ReduceAction60
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist3
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
-                                       )
-                                       var pclassdefnode10 = nodearraylist4
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       listnode11 = concat(listnode11, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
-                                               listnode3,
-                                               listnode5,
-                                               listnode11
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4086,44 +3802,49 @@ private class ReduceAction61
        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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var listnode8 = nodearraylist4
-                                       assert listnode8 isa Array[Object]
-                                       listnode9 = concat(listnode9, listnode8)
-                                       var pclassdefnode7: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode9
-                                       )
-                                       var pclassdefnode10 = nodearraylist5
-                                       assert pclassdefnode10 isa nullable AClassdef
-                                       listnode11 = concat(listnode11, listnode6)
-                                       if pclassdefnode7 != null then
-                                               listnode11.add(pclassdefnode7)
-                                       end
-                                       if pclassdefnode10 != null then
-                                               listnode11.add(pclassdefnode10)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode3,
-                                               listnode5,
-                                               listnode11
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4132,45 +3853,49 @@ private class ReduceAction62
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist2
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist3
-                                       assert listnode7 isa Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode9 = nodearraylist4
-                                       assert listnode9 isa Array[Object]
-                                       listnode10 = concat(listnode10, listnode9)
-                                       var pclassdefnode8: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode10
-                                       )
-                                       var pclassdefnode11 = nodearraylist5
-                                       assert pclassdefnode11 isa nullable AClassdef
-                                       listnode12 = concat(listnode12, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode12.add(pclassdefnode8)
-                                       end
-                                       if pclassdefnode11 != null then
-                                               listnode12.add(pclassdefnode11)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
-                                               listnode4,
-                                               listnode6,
-                                               listnode12
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4179,48 +3904,49 @@ private class ReduceAction63
        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 listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var pmoduledeclnode2 = nodearraylist1
-                                       assert pmoduledeclnode2 isa nullable AModuledecl
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var listnode7 = nodearraylist4
-                                       assert listnode7 isa Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode9 = nodearraylist5
-                                       assert listnode9 isa Array[Object]
-                                       listnode10 = concat(listnode10, listnode9)
-                                       var pclassdefnode8: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
-                                               listnode10
-                                       )
-                                       var pclassdefnode11 = nodearraylist6
-                                       assert pclassdefnode11 isa nullable AClassdef
-                                       listnode12 = concat(listnode12, listnode7)
-                                       if pclassdefnode8 != null then
-                                               listnode12.add(pclassdefnode8)
-                                       end
-                                       if pclassdefnode11 != null then
-                                               listnode12.add(pclassdefnode11)
-                                       end
-                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               pmoduledeclnode2,
-                                               listnode4,
-                                               listnode6,
-                                               listnode12
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmodulenode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4229,24 +3955,45 @@ private class ReduceAction64
        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 listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwmodulenode3 = nodearraylist2
-                                       assert tkwmodulenode3 isa nullable TKwmodule
-                                       var pmodulenamenode4 = nodearraylist4
-                                       assert pmodulenamenode4 isa nullable AModuleName
-                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
-                                               pdocnode2,
-                                               tkwmodulenode3,
-                                               pmodulenamenode4,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       node_list = pmoduledeclnode1
+                                       var pclasskindnode6 = nodearraylist2
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist4
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist5
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist6
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist7
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
+                                       )
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4255,27 +4002,49 @@ private class ReduceAction65
        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 listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwmodulenode3 = nodearraylist2
-                                       assert tkwmodulenode3 isa nullable TKwmodule
-                                       var pmodulenamenode4 = nodearraylist4
-                                       assert pmodulenamenode4 isa nullable AModuleName
-                                       var pannotationsnode5 = nodearraylist5
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist7
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwmodulenode3,
-                                               pmodulenamenode4,
-                                               pannotationsnode5
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
-                                       node_list = pmoduledeclnode1
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4284,25 +4053,49 @@ private class ReduceAction66
        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 pvisibilitynode2 = nodearraylist2
-                                       assert pvisibilitynode2 isa nullable AVisibility
-                                       var tkwimportnode3 = nodearraylist3
-                                       assert tkwimportnode3 isa nullable TKwimport
-                                       var pmodulenamenode4 = nodearraylist5
-                                       assert pmodulenamenode4 isa nullable AModuleName
-                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
-                                               pvisibilitynode2,
-                                               tkwimportnode3,
-                                               pmodulenamenode4,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pimportnode1
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist7
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
+                                       )
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4311,6 +4104,8 @@ private class ReduceAction67
        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
@@ -4318,21 +4113,40 @@ private class ReduceAction67
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pvisibilitynode2 = nodearraylist2
-                                       assert pvisibilitynode2 isa nullable AVisibility
-                                       var tkwimportnode3 = nodearraylist3
-                                       assert tkwimportnode3 isa nullable TKwimport
-                                       var pmodulenamenode4 = nodearraylist5
-                                       assert pmodulenamenode4 isa nullable AModuleName
-                                       var pannotationsnode5 = nodearraylist6
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
-                                               pvisibilitynode2,
-                                               tkwimportnode3,
-                                               pmodulenamenode4,
-                                               pannotationsnode5
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pimportnode1
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist7
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
+                                       )
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4341,24 +4155,49 @@ private class ReduceAction68
        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 pvisibilitynode2 = nodearraylist2
-                                       assert pvisibilitynode2 isa nullable AVisibility
-                                       var tkwimportnode3 = nodearraylist3
-                                       assert tkwimportnode3 isa nullable TKwimport
-                                       var tkwendnode4 = nodearraylist5
-                                       assert tkwendnode4 isa nullable TKwend
-                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
-                                               pvisibilitynode2,
-                                               tkwimportnode3,
-                                               tkwendnode4
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pimportnode1
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist7
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist8
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
+                                       )
+                                       node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4367,15 +4206,46 @@ private class ReduceAction69
        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 listnode3 = new Array[Object]
-                                       var ppropdefnode2 = nodearraylist1
-                                       assert ppropdefnode2 isa nullable APropdef
-                                       if ppropdefnode2 != null then
-                                               listnode3.add(ppropdefnode2)
-                                       end
-                                       var pclassdefnode1: nullable AMainClassdef = new AMainClassdef.init_amainclassdef(
-                                               listnode3
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var pclasskindnode6 = nodearraylist3
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist6
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist7
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4386,33 +4256,9 @@ private class ReduceAction70
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       node_list = null
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction71
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
-                                               null,
-                                               pexprnode3
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction73
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -4420,41 +4266,52 @@ private class ReduceAction73
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist7
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist9
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
+                                               listnode9,
                                                null,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction74
+private class ReduceAction71
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4463,43 +4320,52 @@ private class ReduceAction74
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist8
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist9
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
+                                               listnode9,
                                                null,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction75
+private class ReduceAction72
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4508,41 +4374,51 @@ private class ReduceAction75
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist8
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist9
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
+                                               listnode9,
                                                null,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction76
+private class ReduceAction73
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -4552,41 +4428,51 @@ private class ReduceAction76
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist9
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist9
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
                                                null,
+                                               listnode9,
                                                null,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction78
+private class ReduceAction74
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -4596,43 +4482,53 @@ private class ReduceAction78
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist9
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var pclasskindnode6 = nodearraylist2
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist4
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist5
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist8
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist9
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist10
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
                                                null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
                                                listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               tcbranode11,
+                                               null,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction79
+private class ReduceAction75
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -4643,43 +4539,57 @@ private class ReduceAction79
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var tkwendnode12 = nodearraylist10
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist11
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist12
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
                                                null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
                                                listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               tcbranode11,
+                                               null,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction81
+private class ReduceAction76
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4688,44 +4598,56 @@ private class ReduceAction81
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist8
-                                       assert tkwendnode13 isa nullable TKwend
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist11
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist12
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction82
+private class ReduceAction77
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -4735,46 +4657,56 @@ private class ReduceAction82
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist11
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist12
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction83
+private class ReduceAction78
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -4784,44 +4716,54 @@ private class ReduceAction83
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist11
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist12
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction84
+private class ReduceAction79
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -4832,44 +4774,56 @@ private class ReduceAction84
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               null,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var pclasskindnode6 = nodearraylist3
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist6
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist8
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist9
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist10
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist11
+                                       assert tkwendnode15 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction86
+private class ReduceAction80
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -4880,46 +4834,57 @@ private class ReduceAction86
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction87
+private class ReduceAction81
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -4931,46 +4896,60 @@ private class ReduceAction87
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction89
+private class ReduceAction82
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4979,51 +4958,59 @@ private class ReduceAction89
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var tkwendnode17 = nodearraylist8
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction90
+private class ReduceAction83
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -5033,53 +5020,57 @@ private class ReduceAction90
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var tkwendnode17 = nodearraylist9
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
                                                null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction91
+private class ReduceAction84
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -5089,51 +5080,56 @@ private class ReduceAction91
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var tkwendnode17 = nodearraylist9
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist2
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist4
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist5
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist8
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist9
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist10
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist11
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction92
+private class ReduceAction85
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -5144,51 +5140,58 @@ private class ReduceAction92
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var tkwendnode17 = nodearraylist10
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist11
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction94
+private class ReduceAction86
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -5199,53 +5202,57 @@ private class ReduceAction94
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var tkwendnode17 = nodearraylist10
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist11
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction95
+private class ReduceAction87
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -5257,53 +5264,59 @@ private class ReduceAction95
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var tkwendnode17 = nodearraylist11
-                                       assert tkwendnode17 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist11
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               pvisibilitynode4,
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction97
+private class ReduceAction88
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -5313,54 +5326,57 @@ private class ReduceAction97
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var tkwendnode18 = nodearraylist9
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist4
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist7
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist9
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist10
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist11
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist12
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist13
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction98
+private class ReduceAction89
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -5371,56 +5387,59 @@ private class ReduceAction98
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var pclasskindnode6 = nodearraylist3
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist6
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist8
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist9
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist10
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist11
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist12
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction99
+private class ReduceAction90
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist14 = p.pop
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -5431,54 +5450,60 @@ private class ReduceAction99
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist12
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist13
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist14
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction100
+private class ReduceAction91
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist14 = p.pop
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -5490,54 +5515,60 @@ private class ReduceAction100
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist12
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist13
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist14
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction102
+private class ReduceAction92
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist14 = p.pop
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -5549,56 +5580,59 @@ private class ReduceAction102
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist12
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist13
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist14
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction103
+private class ReduceAction93
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist14 = p.pop
+                                       var nodearraylist13 = p.pop
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -5611,295 +5645,290 @@ private class ReduceAction103
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
+                                       var listnode10 = new Array[Object]
+                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var pclasskindnode6 = nodearraylist5
+                                       assert pclasskindnode6 isa nullable AClasskind
+                                       var pqclassidnode7 = nodearraylist7
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var tobranode8 = nodearraylist8
+                                       assert tobranode8 isa nullable TObra
+                                       var listnode9 = nodearraylist10
+                                       assert listnode9 isa Array[Object]
+                                       listnode10 = concat(listnode10, listnode9)
+                                       var tcbranode11 = nodearraylist11
+                                       assert tcbranode11 isa nullable TCbra
+                                       var pexterncodeblocknode12 = nodearraylist12
+                                       assert pexterncodeblocknode12 isa nullable AExternCodeBlock
+                                       var listnode13 = nodearraylist13
+                                       assert listnode13 isa Array[Object]
+                                       listnode14 = concat(listnode14, listnode13)
+                                       var tkwendnode15 = nodearraylist14
+                                       assert tkwendnode15 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pclasskindnode6,
+                                               pqclassidnode7,
+                                               tobranode8,
+                                               listnode10,
+                                               tcbranode11,
+                                               pexterncodeblocknode12,
+                                               listnode14,
+                                               tkwendnode15
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction105
+private class ReduceAction94
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist6
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist8
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                       var tkwclassnode2 = nodearraylist1
+                                       assert tkwclassnode2 isa nullable TKwclass
+                                       var pclasskindnode1: nullable AConcreteClasskind = new AConcreteClasskind.init_aconcreteclasskind(
+                                               tkwclassnode2
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = pclasskindnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction106
+private class ReduceAction95
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist9
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                       var tkwabstractnode2 = nodearraylist1
+                                       assert tkwabstractnode2 isa nullable TKwabstract
+                                       var tkwclassnode3 = nodearraylist2
+                                       assert tkwclassnode3 isa nullable TKwclass
+                                       var pclasskindnode1: nullable AAbstractClasskind = new AAbstractClasskind.init_aabstractclasskind(
+                                               tkwabstractnode2,
+                                               tkwclassnode3
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = pclasskindnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction107
+private class ReduceAction96
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist9
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                       var tkwinterfacenode2 = nodearraylist1
+                                       assert tkwinterfacenode2 isa nullable TKwinterface
+                                       var pclasskindnode1: nullable AInterfaceClasskind = new AInterfaceClasskind.init_ainterfaceclasskind(
+                                               tkwinterfacenode2
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = pclasskindnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction108
+private class ReduceAction97
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwenumnode2 = nodearraylist1
+                                       assert tkwenumnode2 isa nullable TKwenum
+                                       var pclasskindnode1: nullable AEnumClasskind = new AEnumClasskind.init_aenumclasskind(
+                                               tkwenumnode2
+                                       )
+                                       node_list = pclasskindnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction98
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwexternnode2 = nodearraylist1
+                                       assert tkwexternnode2 isa nullable TKwextern
+                                       var tkwclassnode3 = nodearraylist2
+                                       assert tkwclassnode3 isa nullable TKwclass
+                                       var pclasskindnode1: nullable AExternClasskind = new AExternClasskind.init_aexternclasskind(
+                                               tkwexternnode2,
+                                               tkwclassnode3
+                                       )
+                                       node_list = pclasskindnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction99
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwsubsetnode2 = nodearraylist1
+                                       assert tkwsubsetnode2 isa nullable TKwsubset
+                                       var pclasskindnode1: nullable ASubsetClasskind = new ASubsetClasskind.init_asubsetclasskind(
+                                               tkwsubsetnode2
+                                       )
+                                       node_list = pclasskindnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction100
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pformaldefnode1 = nodearraylist1
+                                       if pformaldefnode1 != null then
+                                               listnode2.add(pformaldefnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction101
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pformaldefnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pformaldefnode1 != null then
+                                               listnode3.add(pformaldefnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction102
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction103
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pformaldefnode1 = nodearraylist3
+                                       node_list = pformaldefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction104
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tclassidnode2 = nodearraylist1
+                                       assert tclassidnode2 isa nullable TClassid
+                                       var ptypenode3 = nodearraylist2
+                                       assert ptypenode3 isa nullable AType
+                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
+                                               tclassidnode2,
+                                               ptypenode3,
+                                               null
+                                       )
+                                       node_list = pformaldefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction105
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist10
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                       var tclassidnode2 = nodearraylist1
+                                       assert tclassidnode2 isa nullable TClassid
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var pannotationsnode4 = nodearraylist2
+                                       assert pannotationsnode4 isa nullable AAnnotations
+                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
+                                               tclassidnode2,
+                                               ptypenode3,
+                                               pannotationsnode4
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = pformaldefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction110
+private class ReduceAction106
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist10
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwsupernode6 = nodearraylist2
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist4
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist5
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pvisibilitynode4,
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction111
+private class ReduceAction107
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5907,47 +5936,36 @@ private class ReduceAction111
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist9
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var tkwendnode12 = nodearraylist11
-                                       assert tkwendnode12 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist4
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist6
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode11,
-                                               tkwendnode12
+                                               pvisibilitynode4,
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction113
+private class ReduceAction108
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5955,49 +5973,36 @@ private class ReduceAction113
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist4
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist6
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction114
+private class ReduceAction109
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6005,51 +6010,36 @@ private class ReduceAction114
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist4
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist6
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               pvisibilitynode4,
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction115
+private class ReduceAction110
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6057,100 +6047,72 @@ private class ReduceAction115
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist4
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist6
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction116
+private class ReduceAction111
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwsupernode6 = nodearraylist3
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist5
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist6
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction118
+private class ReduceAction112
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6159,52 +6121,38 @@ private class ReduceAction118
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist5
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist7
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction119
+private class ReduceAction113
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6213,49 +6161,38 @@ private class ReduceAction119
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var tkwendnode13 = nodearraylist12
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwsupernode6 = nodearraylist5
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist7
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction121
+private class ReduceAction114
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6264,55 +6201,38 @@ private class ReduceAction121
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist7
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist9
-                                       assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwsupernode6 = nodearraylist5
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist7
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction122
+private class ReduceAction115
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6321,58 +6241,91 @@ private class ReduceAction122
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist10
-                                       assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwsupernode6 = nodearraylist5
+                                       assert tkwsupernode6 isa nullable TKwsuper
+                                       var ptypenode7 = nodearraylist7
+                                       assert ptypenode7 isa nullable AType
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ASuperPropdef = new ASuperPropdef.init_asuperpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
-                                               tkwendnode17
+                                               tkwsupernode6,
+                                               ptypenode7,
+                                               pannotationsnode8
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction123
+private class ReduceAction116
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       listnode2 = concat(listnode2, listnode1)
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction117
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var ppropdefnode1 = nodearraylist1
+                                       if ppropdefnode1 != null then
+                                               listnode2.add(ppropdefnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction118
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction119
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ppropdefnode1 = nodearraylist1
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction120
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6380,55 +6333,49 @@ private class ReduceAction123
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist10
+                                       var tkwmethnode6 = nodearraylist2
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
                                        assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
                                                tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction124
+private class ReduceAction121
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6438,55 +6385,51 @@ private class ReduceAction124
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist11
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
                                        assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
                                                tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction126
+private class ReduceAction122
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6496,58 +6439,51 @@ private class ReduceAction126
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist11
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
                                        assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
                                                tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction127
+private class ReduceAction123
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6557,56 +6493,51 @@ private class ReduceAction127
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode16 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist10
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var tkwendnode17 = nodearraylist12
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
                                        assert tkwendnode17 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode16,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
                                                tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction129
+private class ReduceAction124
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6616,59 +6547,51 @@ private class ReduceAction129
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist8
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction130
+private class ReduceAction125
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6677,59 +6600,51 @@ private class ReduceAction130
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist3
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction131
+private class ReduceAction126
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -6740,58 +6655,53 @@ private class ReduceAction131
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction132
+private class ReduceAction127
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -6802,58 +6712,53 @@ private class ReduceAction132
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction134
+private class ReduceAction128
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -6864,61 +6769,53 @@ private class ReduceAction134
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction135
+private class ReduceAction129
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -6929,54 +6826,49 @@ private class ReduceAction135
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist11
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var tkwendnode18 = nodearraylist13
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
-                                       )
-                                       node_list = pclassdefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
 end
-private class ReduceAction137
+private class ReduceAction130
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6989,44 +6881,52 @@ private class ReduceAction137
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist6
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist8
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwmethnode6 = nodearraylist2
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
+                                               null,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction138
+private class ReduceAction131
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7036,46 +6936,54 @@ private class ReduceAction138
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction139
+private class ReduceAction132
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7085,40 +6993,49 @@ private class ReduceAction139
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
+                                               null,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction140
+private class ReduceAction133
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7133,40 +7050,49 @@ private class ReduceAction140
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
+                                               null,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction142
+private class ReduceAction134
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7181,48 +7107,53 @@ private class ReduceAction142
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction143
+private class ReduceAction135
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7232,46 +7163,55 @@ private class ReduceAction143
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwmethnode6 = nodearraylist3
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction145
+private class ReduceAction136
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7281,47 +7221,56 @@ private class ReduceAction145
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist9
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction146
+private class ReduceAction137
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7332,49 +7281,56 @@ private class ReduceAction146
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction147
+private class ReduceAction138
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7385,43 +7341,51 @@ private class ReduceAction147
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction148
+private class ReduceAction139
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7437,106 +7401,99 @@ private class ReduceAction148
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction150
+private class ReduceAction140
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwmethnode6 = nodearraylist2
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction151
+private class ReduceAction141
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -7544,51 +7501,47 @@ private class ReduceAction151
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction153
+private class ReduceAction142
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -7596,57 +7549,47 @@ private class ReduceAction153
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var listnode15 = nodearraylist7
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist9
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction154
+private class ReduceAction143
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -7654,59 +7597,47 @@ private class ReduceAction154
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction155
+private class ReduceAction144
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -7714,116 +7645,94 @@ private class ReduceAction155
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction156
+private class ReduceAction145
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist3
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction158
+private class ReduceAction146
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7832,60 +7741,49 @@ private class ReduceAction158
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction159
+private class ReduceAction147
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7894,58 +7792,49 @@ private class ReduceAction159
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction161
+private class ReduceAction148
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7954,60 +7843,49 @@ private class ReduceAction161
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist8
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist10
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction162
+private class ReduceAction149
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8016,126 +7894,100 @@ private class ReduceAction162
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction163
+private class ReduceAction150
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwisanode8 = nodearraylist2
+                                       assert tkwisanode8 isa nullable TKwisa
                                        var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
                                                listnode13,
+                                               null,
                                                null
                                        )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwdonode19 = nodearraylist3
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist4
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist5
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction164
+private class ReduceAction151
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8143,62 +7995,54 @@ private class ReduceAction164
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
                                        var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
                                                listnode13,
+                                               null,
                                                null
                                        )
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwdonode19 = nodearraylist5
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist6
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist7
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction166
+private class ReduceAction152
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8206,65 +8050,54 @@ private class ReduceAction166
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
                                        var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
                                                listnode13,
+                                               null,
                                                null
                                        )
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwdonode19 = nodearraylist5
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist6
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist7
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction167
+private class ReduceAction153
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8272,61 +8105,54 @@ private class ReduceAction167
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
                                        var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
                                                listnode13,
+                                               null,
                                                null
                                        )
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwdonode19 = nodearraylist5
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist6
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist7
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction169
+private class ReduceAction154
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8334,100 +8160,108 @@ private class ReduceAction169
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist6
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist5
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist6
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist7
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction170
+private class ReduceAction155
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwisanode8 = nodearraylist3
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist4
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist5
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist6
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction171
+private class ReduceAction156
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8436,49 +8270,56 @@ private class ReduceAction171
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
                                                null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction172
+private class ReduceAction157
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8487,49 +8328,56 @@ private class ReduceAction172
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction174
+private class ReduceAction158
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8538,52 +8386,56 @@ private class ReduceAction174
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction175
+private class ReduceAction159
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8592,104 +8444,110 @@ private class ReduceAction175
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist9
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist10
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode13 = nodearraylist12
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction177
+private class ReduceAction160
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwisanode8 = nodearraylist2
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist3
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist4
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist5
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist6
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction178
+private class ReduceAction161
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8698,54 +8556,56 @@ private class ReduceAction178
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist5
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction179
+private class ReduceAction162
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8754,53 +8614,56 @@ private class ReduceAction179
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist5
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction180
+private class ReduceAction163
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8809,53 +8672,56 @@ private class ReduceAction180
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist5
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction182
+private class ReduceAction164
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8864,57 +8730,56 @@ private class ReduceAction182
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist4
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist5
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist6
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist7
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist8
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction183
+private class ReduceAction165
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8922,52 +8787,56 @@ private class ReduceAction183
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist11
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode14 = nodearraylist13
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwisanode8 = nodearraylist3
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode13,
+                                               null,
+                                               null
+                                       )
+                                       var pannotationsnode16 = nodearraylist4
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist5
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist6
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist7
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction185
+private class ReduceAction166
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -8977,58 +8846,58 @@ private class ReduceAction185
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
+                                               listnode13,
                                                null,
-                                               listnode12,
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist7
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pannotationsnode16 = nodearraylist6
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist7
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist8
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist9
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction186
+private class ReduceAction167
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -9038,60 +8907,58 @@ private class ReduceAction186
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
+                                               listnode13,
                                                null,
-                                               listnode12,
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pannotationsnode16 = nodearraylist6
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist7
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist8
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist9
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction187
+private class ReduceAction168
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -9101,59 +8968,58 @@ private class ReduceAction187
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
+                                               listnode13,
                                                null,
-                                               listnode12,
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pannotationsnode16 = nodearraylist6
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist7
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist8
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist9
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction188
+private class ReduceAction169
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -9163,453 +9029,323 @@ private class ReduceAction188
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwisanode8 = nodearraylist5
+                                       assert tkwisanode8 isa nullable TKwisa
+                                       var listnode13 = new Array[Object]
+                                       var psignaturenode11: nullable ASignature = new ASignature.init_asignature(
                                                null,
+                                               listnode13,
                                                null,
-                                               listnode12,
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pannotationsnode16 = nodearraylist6
+                                       assert pannotationsnode16 isa nullable AAnnotations
+                                       var tkwdonode19 = nodearraylist7
+                                       assert tkwdonode19 isa nullable TKwdo
+                                       var pexprnode20 = nodearraylist8
+                                       assert pexprnode20 isa nullable AExpr
+                                       var tkwendnode21 = nodearraylist9
+                                       assert tkwendnode21 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwisanode8,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode16,
+                                               null,
+                                               null,
+                                               tkwdonode19,
+                                               pexprnode20,
+                                               tkwendnode21
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction190
+private class ReduceAction170
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist4
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction191
+private class ReduceAction171
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist10
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist11
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var tkwendnode18 = nodearraylist13
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction193
+private class ReduceAction172
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist8
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction194
+private class ReduceAction173
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction195
+private class ReduceAction174
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction196
+private class ReduceAction175
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
-                                       )
-                                       node_list = pclassdefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
 end
-private class ReduceAction198
+private class ReduceAction176
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9617,68 +9353,47 @@ private class ReduceAction198
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction199
+private class ReduceAction177
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9686,62 +9401,47 @@ private class ReduceAction199
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist11
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist12
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode19 = nodearraylist14
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction201
+private class ReduceAction178
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9749,46 +9449,47 @@ private class ReduceAction201
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist8
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction202
+private class ReduceAction179
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9796,96 +9497,91 @@ private class ReduceAction202
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction203
+private class ReduceAction180
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction204
+private class ReduceAction181
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9893,47 +9589,47 @@ private class ReduceAction204
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction206
+private class ReduceAction182
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9941,50 +9637,47 @@ private class ReduceAction206
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction207
+private class ReduceAction183
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9992,48 +9685,47 @@ private class ReduceAction207
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction209
+private class ReduceAction184
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -10041,102 +9733,94 @@ private class ReduceAction209
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist9
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction210
+private class ReduceAction185
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction211
+private class ReduceAction186
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10145,50 +9829,49 @@ private class ReduceAction211
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction212
+private class ReduceAction187
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10197,50 +9880,49 @@ private class ReduceAction212
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction214
+private class ReduceAction188
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10249,53 +9931,49 @@ private class ReduceAction214
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction215
+private class ReduceAction189
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10304,108 +9982,96 @@ private class ReduceAction215
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction217
+private class ReduceAction190
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode16 = nodearraylist7
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist9
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist4
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist5
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist6
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction218
+private class ReduceAction191
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10414,58 +10080,49 @@ private class ReduceAction218
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var listnode16 = nodearraylist8
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction219
+private class ReduceAction192
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10474,57 +10131,49 @@ private class ReduceAction219
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var listnode16 = nodearraylist8
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction220
+private class ReduceAction193
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10533,57 +10182,49 @@ private class ReduceAction220
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction222
+private class ReduceAction194
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -10592,61 +10233,49 @@ private class ReduceAction222
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
-                                       )
-                                       node_list = pclassdefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction223
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction195
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -10654,57 +10283,49 @@ private class ReduceAction223
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
                                                null,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction225
+private class ReduceAction196
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -10714,59 +10335,51 @@ private class ReduceAction225
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode17 = nodearraylist8
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist10
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction226
+private class ReduceAction197
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -10776,61 +10389,51 @@ private class ReduceAction226
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction227
+private class ReduceAction198
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -10840,60 +10443,51 @@ private class ReduceAction227
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction228
+private class ReduceAction199
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -10903,62 +10497,51 @@ private class ReduceAction228
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwnewnode9,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction230
+private class ReduceAction200
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -10966,63 +10549,49 @@ private class ReduceAction230
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction231
+private class ReduceAction201
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11032,55 +10601,47 @@ private class ReduceAction231
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction233
+private class ReduceAction202
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11094,47 +10655,51 @@ private class ReduceAction233
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist6
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist9
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction234
+private class ReduceAction203
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11144,49 +10709,51 @@ private class ReduceAction234
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction235
+private class ReduceAction204
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11196,49 +10763,51 @@ private class ReduceAction235
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist10
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction236
+private class ReduceAction205
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -11247,47 +10816,51 @@ private class ReduceAction236
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction238
+private class ReduceAction206
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11298,50 +10871,53 @@ private class ReduceAction238
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist11
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction239
+private class ReduceAction207
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11352,44 +10928,49 @@ private class ReduceAction239
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode10 = new Array[Object]
-                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist9
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var tkwendnode13 = nodearraylist12
-                                       assert tkwendnode13 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode10,
-                                               listnode12,
-                                               tkwendnode13
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction241
+private class ReduceAction208
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11404,50 +10985,53 @@ private class ReduceAction241
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction242
+private class ReduceAction209
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11458,55 +11042,53 @@ private class ReduceAction242
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction243
+private class ReduceAction210
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -11514,52 +11096,49 @@ private class ReduceAction243
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist4
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction244
+private class ReduceAction211
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11569,52 +11148,51 @@ private class ReduceAction244
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction246
+private class ReduceAction212
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11624,55 +11202,51 @@ private class ReduceAction246
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction247
+private class ReduceAction213
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11682,52 +11256,51 @@ private class ReduceAction247
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode12 = nodearraylist11
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist13
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction249
+private class ReduceAction214
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -11737,59 +11310,51 @@ private class ReduceAction249
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist7
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist8
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist10
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction250
+private class ReduceAction215
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -11798,59 +11363,51 @@ private class ReduceAction250
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction251
+private class ReduceAction216
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11861,58 +11418,53 @@ private class ReduceAction251
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist11
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction252
+private class ReduceAction217
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11923,58 +11475,53 @@ private class ReduceAction252
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction254
+private class ReduceAction218
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -11985,61 +11532,53 @@ private class ReduceAction254
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist12
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction255
+private class ReduceAction219
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12050,61 +11589,53 @@ private class ReduceAction255
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode15 = new Array[Object]
-                                       var listnode17 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist10
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var tkwendnode18 = nodearraylist13
-                                       assert tkwendnode18 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode15,
-                                               listnode17,
-                                               tkwendnode18
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction257
+private class ReduceAction220
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12113,61 +11644,51 @@ private class ReduceAction257
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist8
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction258
+private class ReduceAction221
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12178,63 +11699,53 @@ private class ReduceAction258
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction259
+private class ReduceAction222
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12245,62 +11756,53 @@ private class ReduceAction259
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction260
+private class ReduceAction223
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12311,62 +11813,53 @@ private class ReduceAction260
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction262
+private class ReduceAction224
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12377,66 +11870,53 @@ private class ReduceAction262
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction263
+private class ReduceAction225
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -12446,61 +11926,55 @@ private class ReduceAction263
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist11
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode17 = nodearraylist12
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist14
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction265
+private class ReduceAction226
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -12510,47 +11984,56 @@ private class ReduceAction265
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist6
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist9
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction266
+private class ReduceAction227
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12561,49 +12044,56 @@ private class ReduceAction266
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction267
+private class ReduceAction228
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12614,43 +12104,51 @@ private class ReduceAction267
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction268
+private class ReduceAction229
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12666,105 +12164,102 @@ private class ReduceAction268
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction270
+private class ReduceAction230
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwmethnode6 = nodearraylist2
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist5
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist6
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
-                                       )
-                                       node_list = pclassdefnode1
-                                       p.push(p.go_to(_goto), node_list)
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction271
+private class ReduceAction231
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12773,51 +12268,49 @@ private class ReduceAction271
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction273
+private class ReduceAction232
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12826,53 +12319,49 @@ private class ReduceAction273
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist8
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist10
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction274
+private class ReduceAction233
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12881,55 +12370,49 @@ private class ReduceAction274
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist9
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist11
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction275
+private class ReduceAction234
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12938,55 +12421,49 @@ private class ReduceAction275
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist9
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist11
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction276
+private class ReduceAction235
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -12994,53 +12471,49 @@ private class ReduceAction276
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist10
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist12
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwmethnode6 = nodearraylist3
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction278
+private class ReduceAction236
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13050,56 +12523,51 @@ private class ReduceAction278
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist10
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist12
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction279
+private class ReduceAction237
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13109,53 +12577,51 @@ private class ReduceAction279
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist11
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist13
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction281
+private class ReduceAction238
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13165,59 +12631,51 @@ private class ReduceAction281
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var listnode15 = nodearraylist7
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist8
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist10
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
-                                       )
-                                       node_list = pclassdefnode1
-                                       p.push(p.go_to(_goto), node_list)
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction282
+private class ReduceAction239
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13227,63 +12685,51 @@ private class ReduceAction282
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction283
+private class ReduceAction240
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -13291,60 +12737,49 @@ private class ReduceAction283
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist2
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction284
+private class ReduceAction241
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13354,60 +12789,51 @@ private class ReduceAction284
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction286
+private class ReduceAction242
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13417,63 +12843,51 @@ private class ReduceAction286
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction287
+private class ReduceAction243
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13483,61 +12897,51 @@ private class ReduceAction287
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
                                                null,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction289
+private class ReduceAction244
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -13547,64 +12951,51 @@ private class ReduceAction289
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       var listnode16 = nodearraylist8
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist9
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist11
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist4
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwmethnode6,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction290
+private class ReduceAction245
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -13613,64 +13004,51 @@ private class ReduceAction290
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist10
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist12
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwmethnode6 = nodearraylist3
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction291
+private class ReduceAction246
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -13681,63 +13059,53 @@ private class ReduceAction291
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist10
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist12
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction292
+private class ReduceAction247
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -13748,63 +13116,53 @@ private class ReduceAction292
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode6,
                                                null,
                                                null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist11
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist13
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction294
+private class ReduceAction248
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -13815,66 +13173,53 @@ private class ReduceAction294
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist11
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist13
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwmethnode6,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               null,
+                                               null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction295
+private class ReduceAction249
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -13885,119 +13230,94 @@ private class ReduceAction295
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist12
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist14
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwmethnode6 = nodearraylist5
+                                       assert tkwmethnode6 isa nullable TKwmeth
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
+                                               tkwmethnode6,
+                                               null,
+                                               null,
                                                null,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction297
+private class ReduceAction250
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist6
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist7
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist10
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist5
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction298
+private class ReduceAction251
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -14005,55 +13325,44 @@ private class ReduceAction298
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction299
+private class ReduceAction252
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -14061,54 +13370,44 @@ private class ReduceAction299
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist7
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist11
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction300
+private class ReduceAction253
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -14116,54 +13415,44 @@ private class ReduceAction300
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction302
+private class ReduceAction254
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -14171,112 +13460,88 @@ private class ReduceAction302
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist12
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction303
+private class ReduceAction255
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode11 = new Array[Object]
-                                       var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var pexterncodeblocknode9 = nodearraylist9
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist10
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var listnode12 = nodearraylist11
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var tkwendnode14 = nodearraylist13
-                                       assert tkwendnode14 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist6
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               listnode13,
-                                               tkwendnode14
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction305
+private class ReduceAction256
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -14285,56 +13550,46 @@ private class ReduceAction305
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist9
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist11
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction306
+private class ReduceAction257
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -14343,58 +13598,46 @@ private class ReduceAction306
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist10
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist12
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction307
+private class ReduceAction258
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -14403,57 +13646,46 @@ private class ReduceAction307
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist10
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist12
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction308
+private class ReduceAction259
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -14462,57 +13694,46 @@ private class ReduceAction308
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist11
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist13
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction310
+private class ReduceAction260
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -14521,58 +13742,46 @@ private class ReduceAction310
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist10
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist11
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist13
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist5
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist7
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction311
+private class ReduceAction261
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -14583,55 +13792,48 @@ private class ReduceAction311
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode12 = new Array[Object]
-                                       var listnode14 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var listnode11 = nodearraylist11
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var listnode13 = nodearraylist12
-                                       assert listnode13 isa Array[Object]
-                                       listnode14 = concat(listnode14, listnode13)
-                                       var tkwendnode15 = nodearraylist14
-                                       assert tkwendnode15 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist9
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
                                                null,
-                                               pexterncodeblocknode10,
-                                               listnode12,
-                                               listnode14,
-                                               tkwendnode15
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction313
+private class ReduceAction262
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -14642,61 +13844,48 @@ private class ReduceAction313
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist6
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist7
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist8
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist9
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist11
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist9
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction314
+private class ReduceAction263
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -14707,63 +13896,48 @@ private class ReduceAction314
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist9
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction315
+private class ReduceAction264
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -14774,63 +13948,48 @@ private class ReduceAction315
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist7
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist9
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
                                                null,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
                                                null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist8
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist9
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist10
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist12
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
                                                null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction316
+private class ReduceAction265
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -14840,61 +13999,48 @@ private class ReduceAction316
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist6
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction318
+private class ReduceAction266
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -14906,64 +14052,50 @@ private class ReduceAction318
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist8
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist9
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist10
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist11
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist13
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist8
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist10
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist11
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction319
+private class ReduceAction267
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -14975,62 +14107,50 @@ private class ReduceAction319
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode7 = new Array[Object]
-                                       var listnode16 = new Array[Object]
-                                       var listnode18 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode12 = new Array[Object]
-                                       var listnode11 = nodearraylist9
-                                       assert listnode11 isa Array[Object]
-                                       listnode12 = concat(listnode12, listnode11)
-                                       var pannotationsnode8: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode12,
-                                               null
-                                       )
-                                       var pexterncodeblocknode14 = nodearraylist10
-                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
-                                       var listnode15 = nodearraylist11
-                                       assert listnode15 isa Array[Object]
-                                       listnode16 = concat(listnode16, listnode15)
-                                       var listnode17 = nodearraylist12
-                                       assert listnode17 isa Array[Object]
-                                       listnode18 = concat(listnode18, listnode17)
-                                       var tkwendnode19 = nodearraylist14
-                                       assert tkwendnode19 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist8
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist10
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist11
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode7,
-                                               pannotationsnode8,
-                                               pexterncodeblocknode14,
-                                               listnode16,
-                                               listnode18,
-                                               tkwendnode19
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction321
+private class ReduceAction268
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -15042,64 +14162,50 @@ private class ReduceAction321
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist7
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist8
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist10
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist11
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
                                                null,
                                                null,
-                                               listnode13,
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist8
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist9
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist10
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist12
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
-                                       )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction322
+private class ReduceAction269
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -15111,139 +14217,94 @@ private class ReduceAction322
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
-                                       )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist11
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist13
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tassignnode9 = nodearraylist8
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist10
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode11 = nodearraylist11
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               tassignnode9,
+                                               pexprnode10,
+                                               pannotationsnode11,
+                                               null,
+                                               null,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction323
+private class ReduceAction270
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist8
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist9
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist10
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist11
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist13
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist5
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist6
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction324
+private class ReduceAction271
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -15252,68 +14313,46 @@ private class ReduceAction324
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist12
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist14
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction326
+private class ReduceAction272
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -15322,71 +14361,46 @@ private class ReduceAction326
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist7
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist8
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist9
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist10
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist11
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist12
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist14
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction327
+private class ReduceAction273
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist15 = p.pop
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -15395,357 +14409,547 @@ private class ReduceAction327
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode8 = new Array[Object]
-                                       var listnode17 = new Array[Object]
-                                       var listnode19 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa nullable AClasskind
-                                       var tclassidnode6 = nodearraylist8
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist9
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode13 = new Array[Object]
-                                       var listnode12 = nodearraylist10
-                                       assert listnode12 isa Array[Object]
-                                       listnode13 = concat(listnode13, listnode12)
-                                       var pannotationsnode9: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode13,
-                                               null
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       var pexterncodeblocknode15 = nodearraylist11
-                                       assert pexterncodeblocknode15 isa nullable AExternCodeBlock
-                                       var listnode16 = nodearraylist12
-                                       assert listnode16 isa Array[Object]
-                                       listnode17 = concat(listnode17, listnode16)
-                                       var listnode18 = nodearraylist13
-                                       assert listnode18 isa Array[Object]
-                                       listnode19 = concat(listnode19, listnode18)
-                                       var tkwendnode20 = nodearraylist15
-                                       assert tkwendnode20 isa nullable TKwend
-                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               pclasskindnode5,
-                                               tclassidnode6,
-                                               listnode8,
-                                               pannotationsnode9,
-                                               pexterncodeblocknode15,
-                                               listnode17,
-                                               listnode19,
-                                               tkwendnode20
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclassdefnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction329
+private class ReduceAction274
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwclassnode2 = nodearraylist1
-                                       assert tkwclassnode2 isa nullable TKwclass
-                                       var pclasskindnode1: nullable AConcreteClasskind = new AConcreteClasskind.init_aconcreteclasskind(
-                                               tkwclassnode2
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pclasskindnode1
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction330
+private class ReduceAction275
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwabstractnode2 = nodearraylist1
-                                       assert tkwabstractnode2 isa nullable TKwabstract
-                                       var tkwclassnode3 = nodearraylist2
-                                       assert tkwclassnode3 isa nullable TKwclass
-                                       var pclasskindnode1: nullable AAbstractClasskind = new AAbstractClasskind.init_aabstractclasskind(
-                                               tkwabstractnode2,
-                                               tkwclassnode3
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pclasskindnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction331
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwinterfacenode2 = nodearraylist1
-                                       assert tkwinterfacenode2 isa nullable TKwinterface
-                                       var pclasskindnode1: nullable AInterfaceClasskind = new AInterfaceClasskind.init_ainterfaceclasskind(
-                                               tkwinterfacenode2
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist6
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist7
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclasskindnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction332
+private class ReduceAction276
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwenumnode2 = nodearraylist1
-                                       assert tkwenumnode2 isa nullable TKwenum
-                                       var pclasskindnode1: nullable AEnumClasskind = new AEnumClasskind.init_aenumclasskind(
-                                               tkwenumnode2
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclasskindnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction333
+private class ReduceAction277
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwexternnode2 = nodearraylist1
-                                       assert tkwexternnode2 isa nullable TKwextern
-                                       var pclasskindnode1: nullable AExternClasskind = new AExternClasskind.init_aexternclasskind(
-                                               tkwexternnode2,
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
                                                null
                                        )
-                                       node_list = pclasskindnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction334
+private class ReduceAction278
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwexternnode2 = nodearraylist1
-                                       assert tkwexternnode2 isa nullable TKwextern
-                                       var tkwclassnode3 = nodearraylist2
-                                       assert tkwclassnode3 isa nullable TKwclass
-                                       var pclasskindnode1: nullable AExternClasskind = new AExternClasskind.init_aexternclasskind(
-                                               tkwexternnode2,
-                                               tkwclassnode3
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = pclasskindnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction335
+private class ReduceAction279
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pformaldefnode1 = nodearraylist3
-                                       if pformaldefnode1 != null then
-                                               listnode2.add(pformaldefnode1)
-                                       end
-                                       node_list = listnode2
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction336
+private class ReduceAction280
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pformaldefnode1 = nodearraylist3
-                                       var listnode2 = nodearraylist4
-                                       assert listnode2 isa Array[Object]
-                                       if pformaldefnode1 != null then
-                                               listnode3.add(pformaldefnode1)
-                                       end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist5
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist6
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist7
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction337
+private class ReduceAction281
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pformaldefnode1 = nodearraylist3
-                                       node_list = pformaldefnode1
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction338
+private class ReduceAction282
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
-                                               tclassidnode2,
-                                               null,
-                                               null
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pformaldefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction339
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var pannotationsnode4 = nodearraylist2
-                                       assert pannotationsnode4 isa nullable AAnnotations
-                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
-                                               tclassidnode2,
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
                                                null,
-                                               pannotationsnode4
-                                       )
-                                       node_list = pformaldefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction340
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa nullable AType
-                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
-                                               tclassidnode2,
-                                               ptypenode3,
-                                               null
-                                       )
-                                       node_list = pformaldefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction341
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var pannotationsnode4 = nodearraylist2
-                                       assert pannotationsnode4 isa nullable AAnnotations
-                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
-                                               tclassidnode2,
-                                               ptypenode3,
-                                               pannotationsnode4
-                                       )
-                                       node_list = pformaldefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction342
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tkwsupernode2 = nodearraylist2
-                                       assert tkwsupernode2 isa nullable TKwsuper
-                                       var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa nullable AType
-                                       var psuperclassnode1: nullable ASuperclass = new ASuperclass.init_asuperclass(
-                                               tkwsupernode2,
-                                               ptypenode3,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
                                                null
                                        )
-                                       node_list = psuperclassnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction343
+private class ReduceAction283
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwsupernode2 = nodearraylist2
-                                       assert tkwsupernode2 isa nullable TKwsuper
-                                       var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa nullable AType
-                                       var pannotationsnode4 = nodearraylist5
-                                       assert pannotationsnode4 isa nullable AAnnotations
-                                       var psuperclassnode1: nullable ASuperclass = new ASuperclass.init_asuperclass(
-                                               tkwsupernode2,
-                                               ptypenode3,
-                                               pannotationsnode4
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
-                                       node_list = psuperclassnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction344
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var ppropdefnode1 = nodearraylist1
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction345
+private class ReduceAction284
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -15755,31 +14959,42 @@ private class ReduceAction345
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction346
+private class ReduceAction285
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -15796,35 +15011,46 @@ private class ReduceAction346
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist6
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction347
+private class ReduceAction286
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -15835,37 +15061,49 @@ private class ReduceAction347
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction348
+private class ReduceAction287
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -15879,37 +15117,48 @@ private class ReduceAction348
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist9
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction349
+private class ReduceAction288
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -15920,35 +15169,49 @@ private class ReduceAction349
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction350
+private class ReduceAction289
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -15962,37 +15225,46 @@ private class ReduceAction350
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction351
+private class ReduceAction290
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -16002,38 +15274,44 @@ private class ReduceAction351
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist5
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist6
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist7
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction352
+private class ReduceAction291
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -16045,39 +15323,47 @@ private class ReduceAction352
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist9
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction353
+private class ReduceAction292
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16088,31 +15374,42 @@ private class ReduceAction353
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction354
+private class ReduceAction293
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -16128,37 +15425,49 @@ private class ReduceAction354
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist9
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction355
+private class ReduceAction294
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -16167,34 +15476,47 @@ private class ReduceAction355
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction356
+private class ReduceAction295
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -16206,34 +15528,47 @@ private class ReduceAction356
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist6
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist7
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction357
+private class ReduceAction296
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -16243,32 +15578,50 @@ private class ReduceAction357
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction358
+private class ReduceAction297
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16281,32 +15634,49 @@ private class ReduceAction358
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction359
+private class ReduceAction298
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -16316,31 +15686,50 @@ private class ReduceAction359
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AInternMethPropdef = new AInternMethPropdef.init_ainternmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction360
+private class ReduceAction299
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16353,31 +15742,47 @@ private class ReduceAction360
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AInternMethPropdef = new AInternMethPropdef.init_ainternmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction361
+private class ReduceAction300
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -16387,34 +15792,48 @@ private class ReduceAction361
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist2
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist5
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist6
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist7
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist8
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
                                                null,
-                                               null
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction362
+private class ReduceAction301
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16425,36 +15844,50 @@ private class ReduceAction362
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
                                                null,
-                                               null
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction363
+private class ReduceAction302
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16465,36 +15898,49 @@ private class ReduceAction363
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               null
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction364
+private class ReduceAction303
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -16506,38 +15952,50 @@ private class ReduceAction364
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               null
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction365
+private class ReduceAction304
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16548,32 +16006,44 @@ private class ReduceAction365
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist4
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist8
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist10
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncallsnode9,
-                                               null
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction366
+private class ReduceAction305
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -16591,36 +16061,48 @@ private class ReduceAction366
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwvarnode6 = nodearraylist3
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist4
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist6
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist7
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist9
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
-                                               pexterncallsnode9,
-                                               null
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction367
+private class ReduceAction306
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -16632,38 +16114,51 @@ private class ReduceAction367
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist11
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction368
+private class ReduceAction307
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -16678,38 +16173,51 @@ private class ReduceAction368
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist11
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
+                                               null,
+                                               null,
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction369
+private class ReduceAction308
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16720,36 +16228,52 @@ private class ReduceAction369
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist11
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
                                                null,
-                                               pexterncodeblocknode10
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction370
+private class ReduceAction309
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -16763,39 +16287,48 @@ private class ReduceAction370
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwvarnode6 = nodearraylist5
+                                       assert tkwvarnode6 isa nullable TKwvar
+                                       var tidnode7 = nodearraylist6
+                                       assert tidnode7 isa nullable TId
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var tkwdonode12 = nodearraylist9
+                                       assert tkwdonode12 isa nullable TKwdo
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwendnode14 = nodearraylist11
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               tkwvarnode6,
+                                               tidnode7,
+                                               ptypenode8,
                                                null,
                                                null,
-                                               pexterncodeblocknode10
+                                               pannotationsnode11,
+                                               tkwdonode12,
+                                               pexprnode13,
+                                               tkwendnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction371
+private class ReduceAction310
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -16804,40 +16337,45 @@ private class ReduceAction371
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist2
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist4
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist5
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist6
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
                                                null,
-                                               pexterncodeblocknode10
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
 end
-private class ReduceAction372
+private class ReduceAction311
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16848,41 +16386,47 @@ private class ReduceAction372
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
                                                null,
-                                               pexterncodeblocknode10
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction373
+private class ReduceAction312
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16893,40 +16437,47 @@ private class ReduceAction373
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction374
+private class ReduceAction313
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16937,42 +16488,47 @@ private class ReduceAction374
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction375
+private class ReduceAction314
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -16983,44 +16539,47 @@ private class ReduceAction375
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction376
+private class ReduceAction315
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17032,40 +16591,48 @@ private class ReduceAction376
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist11
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist3
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction377
+private class ReduceAction316
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17074,36 +16641,51 @@ private class ReduceAction377
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist6
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                               null,
+                                               tkwinitnode7,
+                                               null,
                                                null,
                                                null,
-                                               pexterncodeblocknode10
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction378
+private class ReduceAction317
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17115,36 +16697,49 @@ private class ReduceAction378
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
                                                null,
-                                               pexterncodeblocknode10
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction379
+private class ReduceAction318
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17154,38 +16749,50 @@ private class ReduceAction379
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist6
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction380
+private class ReduceAction319
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -17198,72 +16805,101 @@ private class ReduceAction380
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa nullable TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tkwinitnode7,
+                                               null,
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction381
+private class ReduceAction320
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist3
-                                       assert tkwvarnode7 isa nullable TKwvar
-                                       var tattridnode8 = nodearraylist4
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist2
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
                                                null,
-                                               null
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction382
+private class ReduceAction321
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -17271,36 +16907,53 @@ private class ReduceAction382
                                        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 tattridnode8 = nodearraylist5
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction383
+private class ReduceAction322
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -17308,36 +16961,52 @@ private class ReduceAction383
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
                                                null,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
                                                null,
-                                               null
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction384
+private class ReduceAction323
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17346,38 +17015,53 @@ private class ReduceAction384
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction385
+private class ReduceAction324
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -17385,36 +17069,51 @@ private class ReduceAction385
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
                                                null,
-                                               null
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction386
+private class ReduceAction325
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17423,38 +17122,53 @@ private class ReduceAction386
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist3
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction387
+private class ReduceAction326
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17463,39 +17177,55 @@ private class ReduceAction387
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction388
+private class ReduceAction327
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = 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
@@ -17504,40 +17234,56 @@ private class ReduceAction388
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               null
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction389
+private class ReduceAction328
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -17545,36 +17291,55 @@ private class ReduceAction389
                                        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 tattridnode8 = nodearraylist4
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa nullable AType
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               null
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction390
+private class ReduceAction329
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17583,38 +17348,52 @@ private class ReduceAction390
                                        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 tattridnode8 = nodearraylist5
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa nullable AType
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction391
+private class ReduceAction330
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17623,38 +17402,49 @@ private class ReduceAction391
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist2
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist4
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist5
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist6
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist7
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
                                                null,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               null
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction392
+private class ReduceAction331
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17664,40 +17454,52 @@ private class ReduceAction392
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
                                                null,
-                                               ptypenode10,
+                                               tkwinitnode7,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction393
+private class ReduceAction332
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -17706,38 +17508,51 @@ private class ReduceAction393
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               null
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction394
+private class ReduceAction333
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17747,40 +17562,51 @@ private class ReduceAction394
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
                                                null,
-                                               ptypenode10,
+                                               tkwinitnode7,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction395
+private class ReduceAction334
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17790,36 +17616,45 @@ private class ReduceAction395
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               null
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction396
+private class ReduceAction335
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -17834,42 +17669,52 @@ private class ReduceAction396
                                        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 ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist3
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               ptypenode10,
+                                               tkwinitnode7,
                                                null,
-                                               null
+                                               null,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction397
+private class ReduceAction336
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -17879,36 +17724,53 @@ private class ReduceAction397
                                        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 tattridnode8 = nodearraylist4
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode12 = nodearraylist7
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
                                                null,
-                                               pexprnode12
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction398
+private class ReduceAction337
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -17919,38 +17781,53 @@ private class ReduceAction398
                                        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 tattridnode8 = nodearraylist5
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
                                                null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction399
+private class ReduceAction338
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -17961,38 +17838,52 @@ private class ReduceAction399
                                        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 pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
                                                null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction400
+private class ReduceAction339
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18004,36 +17895,47 @@ private class ReduceAction400
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
                                                null,
                                                null,
-                                               pexprnode12
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction401
+private class ReduceAction340
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -18048,38 +17950,50 @@ private class ReduceAction401
                                        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 pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist2
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist6
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist7
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist8
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
                                                null,
-                                               pexprnode12
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction402
+private class ReduceAction341
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18091,40 +18005,52 @@ private class ReduceAction402
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               pexprnode12
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction403
+private class ReduceAction342
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18136,36 +18062,47 @@ private class ReduceAction403
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               pexprnode12
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction404
+private class ReduceAction343
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -18182,42 +18119,53 @@ private class ReduceAction404
                                        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 pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
+                                               pvisibilitynode4,
+                                               null,
+                                               tkwinitnode7,
                                                null,
                                                null,
-                                               pexprnode12
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction405
+private class ReduceAction344
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -18228,34 +18176,47 @@ private class ReduceAction405
                                        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 tattridnode8 = nodearraylist4
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa nullable AType
-                                       var pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist4
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist8
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist9
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist10
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction406
+private class ReduceAction345
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -18271,40 +18232,53 @@ private class ReduceAction406
                                        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 tattridnode8 = nodearraylist5
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa nullable AType
-                                       var pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwinitnode7 = nodearraylist3
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist7
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist8
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist9
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction407
+private class ReduceAction346
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18316,40 +18290,54 @@ private class ReduceAction407
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction408
+private class ReduceAction347
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -18362,42 +18350,55 @@ private class ReduceAction408
                                        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 pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               pexprnode12
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction409
+private class ReduceAction348
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18409,40 +18410,54 @@ private class ReduceAction409
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
+                                               tkwinitnode7,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction410
+private class ReduceAction349
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -18455,47 +18470,53 @@ private class ReduceAction410
                                        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 pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwinitnode7 = nodearraylist5
+                                       assert tkwinitnode7 isa nullable TKwinit
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var tkwdonode15 = nodearraylist9
+                                       assert tkwdonode15 isa nullable TKwdo
+                                       var pexprnode16 = nodearraylist10
+                                       assert pexprnode16 isa nullable AExpr
+                                       var tkwendnode17 = nodearraylist11
+                                       assert tkwendnode17 isa nullable TKwend
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
+                                               tkwinitnode7,
                                                null,
-                                               ptypenode10,
                                                null,
-                                               pexprnode12
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               null,
+                                               null,
+                                               tkwdonode15,
+                                               pexprnode16,
+                                               tkwendnode17
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction411
+private class ReduceAction350
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -18503,46 +18524,35 @@ private class ReduceAction411
                                        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 pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwtypenode6 = nodearraylist2
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist3
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist4
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist5
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
-                                               null,
-                                               ptypenode10,
                                                null,
-                                               pexprnode12
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction412
+private class ReduceAction351
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -18552,78 +18562,79 @@ private class ReduceAction412
                                        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 pexprnode12 = nodearraylist11
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist4
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist7
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               tattridnode8,
                                                null,
-                                               ptypenode10,
-                                               null,
-                                               pexprnode12
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction413
+private class ReduceAction352
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist3
-                                       assert tkwvarnode7 isa nullable TKwvar
-                                       var tidnode9 = nodearraylist4
-                                       assert tidnode9 isa nullable TId
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist4
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist7
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
                                                null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               null,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction414
+private class ReduceAction353
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -18631,36 +18642,39 @@ private class ReduceAction414
                                        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(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist4
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist7
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
                                                null,
-                                               null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               null,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction415
+private class ReduceAction354
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -18668,32 +18682,33 @@ private class ReduceAction415
                                        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(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist4
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist5
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist6
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist7
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
                                                null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction416
+private class ReduceAction355
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -18706,38 +18721,40 @@ private class ReduceAction416
                                        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,
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
+                                       var tkwtypenode6 = nodearraylist3
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist4
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist5
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist6
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
+                                       )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction417
+private class ReduceAction356
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -18745,36 +18762,41 @@ private class ReduceAction417
                                        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(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist5
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist8
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               null,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction418
+private class ReduceAction357
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -18783,38 +18805,41 @@ private class ReduceAction418
                                        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(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist5
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist8
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               null,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction419
+private class ReduceAction358
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -18823,38 +18848,40 @@ private class ReduceAction419
                                        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(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist5
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist8
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction420
+private class ReduceAction359
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -18864,36 +18891,35 @@ private class ReduceAction420
                                        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(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwtypenode6 = nodearraylist5
+                                       assert tkwtypenode6 isa nullable TKwtype
+                                       var pqclassidnode7 = nodearraylist6
+                                       assert pqclassidnode7 isa nullable AQclassid
+                                       var ptypenode8 = nodearraylist7
+                                       assert ptypenode8 isa nullable AType
+                                       var pannotationsnode9 = nodearraylist8
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
-                                               null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode6,
+                                               pqclassidnode7,
+                                               ptypenode8,
+                                               pannotationsnode9
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction421
+private class ReduceAction360
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -18905,36 +18931,44 @@ private class ReduceAction421
                                        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 pannotationsnode11 = nodearraylist5
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist4
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist5
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               tidnode9,
                                                null,
-                                               pannotationsnode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction422
+private class ReduceAction361
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -18943,38 +18977,46 @@ private class ReduceAction422
                                        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 pannotationsnode11 = nodearraylist6
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
                                                null,
-                                               pannotationsnode11,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction423
+private class ReduceAction362
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -18983,34 +19025,41 @@ private class ReduceAction423
                                        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 pannotationsnode11 = nodearraylist6
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction424
+private class ReduceAction363
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19024,40 +19073,46 @@ private class ReduceAction424
                                        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 pannotationsnode11 = nodearraylist7
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction425
+private class ReduceAction364
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -19066,39 +19121,45 @@ private class ReduceAction425
                                        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 pannotationsnode11 = nodearraylist6
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
                                                null,
-                                               pannotationsnode11,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction426
+private class ReduceAction365
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -19107,40 +19168,46 @@ private class ReduceAction426
                                        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 pannotationsnode11 = nodearraylist7
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist5
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist6
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
                                                null,
-                                               pannotationsnode11,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction427
+private class ReduceAction366
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -19150,36 +19217,43 @@ private class ReduceAction427
                                        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 pannotationsnode11 = nodearraylist7
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction428
+private class ReduceAction367
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19194,42 +19268,48 @@ private class ReduceAction428
                                        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 pannotationsnode11 = nodearraylist8
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction429
+private class ReduceAction368
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -19239,32 +19319,43 @@ private class ReduceAction429
                                        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 pexprnode12 = nodearraylist7
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               tkwnewnode9,
                                                null,
-                                               tidnode9,
+                                               psignaturenode11,
                                                null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               pexprnode12
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction430
+private class ReduceAction369
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19279,40 +19370,47 @@ private class ReduceAction430
                                        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 pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
+                                               tkwnewnode9,
                                                null,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction431
+private class ReduceAction370
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -19321,39 +19419,45 @@ private class ReduceAction431
                                        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 pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist5
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist6
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction432
+private class ReduceAction371
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19364,36 +19468,43 @@ private class ReduceAction432
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction433
+private class ReduceAction372
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19408,39 +19519,47 @@ private class ReduceAction433
                                        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 pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
                                                null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction434
+private class ReduceAction373
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19451,41 +19570,47 @@ private class ReduceAction434
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
-                                               tidnode9,
                                                null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction435
+private class ReduceAction374
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19496,43 +19621,47 @@ private class ReduceAction435
                                        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 pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction436
+private class ReduceAction375
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -19542,42 +19671,48 @@ private class ReduceAction436
                                        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 pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
                                                null,
-                                               pexprnode12
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction437
+private class ReduceAction376
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19588,34 +19723,45 @@ private class ReduceAction437
                                        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 pannotationsnode11 = nodearraylist8
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist7
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               tidnode9,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
                                                null,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction438
+private class ReduceAction377
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19631,36 +19777,45 @@ private class ReduceAction438
                                        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 pannotationsnode11 = nodearraylist9
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction439
+private class ReduceAction378
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19676,41 +19831,49 @@ private class ReduceAction439
                                        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 pannotationsnode11 = nodearraylist9
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction440
+private class ReduceAction379
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -19722,45 +19885,49 @@ private class ReduceAction440
                                        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 pannotationsnode11 = nodearraylist10
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
                                                null,
                                                null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               null,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction441
+private class ReduceAction380
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -19769,42 +19936,45 @@ private class ReduceAction441
                                        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 pannotationsnode11 = nodearraylist9
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist8
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist3
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist4
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist5
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist6
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
+                                               tkwnewnode9,
                                                null,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction442
+private class ReduceAction381
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19815,44 +19985,47 @@ private class ReduceAction442
                                        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 pannotationsnode11 = nodearraylist10
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               pvisibilitynode4,
                                                null,
-                                               tidnode9,
                                                null,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction443
+private class ReduceAction382
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19863,45 +20036,47 @@ private class ReduceAction443
                                        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 pannotationsnode11 = nodearraylist10
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist9
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
+                                               pvisibilitynode4,
                                                null,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction444
+private class ReduceAction383
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -19912,44 +20087,49 @@ private class ReduceAction444
                                        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 pannotationsnode11 = nodearraylist11
-                                       assert pannotationsnode11 isa nullable AAnnotations
-                                       var pexprnode12 = nodearraylist10
-                                       assert pexprnode12 isa nullable AExpr
-                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               tkwvarnode7,
+                                               pvisibilitynode4,
+                                               null,
                                                null,
-                                               tidnode9,
-                                               ptypenode10,
-                                               pannotationsnode11,
-                                               pexprnode12
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction445
+private class ReduceAction384
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -19958,29 +20138,43 @@ private class ReduceAction445
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist6
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction446
+private class ReduceAction385
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -19996,33 +20190,47 @@ private class ReduceAction446
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction447
+private class ReduceAction386
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20032,35 +20240,50 @@ private class ReduceAction447
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction448
+private class ReduceAction387
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20073,35 +20296,49 @@ private class ReduceAction448
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction449
+private class ReduceAction388
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20111,35 +20348,50 @@ private class ReduceAction449
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist5
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction450
+private class ReduceAction389
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20152,36 +20404,47 @@ private class ReduceAction450
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               null,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction451
+private class ReduceAction390
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20191,33 +20454,43 @@ private class ReduceAction451
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist2
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist3
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist4
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist5
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist6
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist7
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction452
+private class ReduceAction391
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20233,39 +20506,51 @@ private class ReduceAction452
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist9
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction453
+private class ReduceAction392
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20275,33 +20560,50 @@ private class ReduceAction453
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist6
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction454
+private class ReduceAction393
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20312,35 +20614,50 @@ private class ReduceAction454
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               tkwredefnode3,
+                                               null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction455
+private class ReduceAction394
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20351,36 +20668,49 @@ private class ReduceAction455
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist4
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist5
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist6
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist7
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist8
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist9
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction456
+private class ReduceAction395
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20393,35 +20723,49 @@ private class ReduceAction456
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var tkwnewnode9 = nodearraylist3
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist4
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist5
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist6
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist7
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist8
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
                                                null,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction457
+private class ReduceAction396
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -20432,35 +20776,52 @@ private class ReduceAction457
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist5
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist7
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction458
+private class ReduceAction397
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -20474,35 +20835,50 @@ private class ReduceAction458
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
                                                null,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction459
+private class ReduceAction398
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -20514,33 +20890,47 @@ private class ReduceAction459
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist8
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
-                                               null,
+                                               tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction460
+private class ReduceAction399
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20559,33 +20949,1663 @@ private class ReduceAction460
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
                                        assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa nullable TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var pexprnode9 = nodearraylist9
-                                       assert pexprnode9 isa nullable AExpr
-                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var tkwnewnode9 = nodearraylist5
+                                       assert tkwnewnode9 isa nullable TKwnew
+                                       var pmethidnode10 = nodearraylist6
+                                       assert pmethidnode10 isa nullable AMethid
+                                       var psignaturenode11 = nodearraylist7
+                                       assert psignaturenode11 isa nullable ASignature
+                                       var pannotationsnode12 = nodearraylist8
+                                       assert pannotationsnode12 isa nullable AAnnotations
+                                       var pexterncallsnode13 = nodearraylist9
+                                       assert pexterncallsnode13 isa nullable AExternCalls
+                                       var pexterncodeblocknode14 = nodearraylist10
+                                       assert pexterncodeblocknode14 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pannotationsnode8,
-                                               pexprnode9
+                                               null,
+                                               null,
+                                               null,
+                                               tkwnewnode9,
+                                               pmethidnode10,
+                                               psignaturenode11,
+                                               pannotationsnode12,
+                                               pexterncallsnode13,
+                                               pexterncodeblocknode14,
+                                               null,
+                                               null,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction461
+private class ReduceAction400
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var ppropdefnode1 = nodearraylist1
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction402
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction403
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tkwendnode8 = nodearraylist4
+                                       assert tkwendnode8 isa nullable TKwend
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               tkwendnode8
+                                       )
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction406
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction407
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tplusnode2 = nodearraylist1
+                                       assert tplusnode2 isa nullable TPlus
+                                       var pmethidnode1: nullable APlusMethid = new APlusMethid.init_aplusmethid(
+                                               tplusnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction408
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tminusnode2 = nodearraylist1
+                                       assert tminusnode2 isa nullable TMinus
+                                       var pmethidnode1: nullable AMinusMethid = new AMinusMethid.init_aminusmethid(
+                                               tminusnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction409
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tstarnode2 = nodearraylist1
+                                       assert tstarnode2 isa nullable TStar
+                                       var pmethidnode1: nullable AStarMethid = new AStarMethid.init_astarmethid(
+                                               tstarnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction410
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tstarstarnode2 = nodearraylist1
+                                       assert tstarstarnode2 isa nullable TStarstar
+                                       var pmethidnode1: nullable AStarstarMethid = new AStarstarMethid.init_astarstarmethid(
+                                               tstarstarnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction411
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tslashnode2 = nodearraylist1
+                                       assert tslashnode2 isa nullable TSlash
+                                       var pmethidnode1: nullable ASlashMethid = new ASlashMethid.init_aslashmethid(
+                                               tslashnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction412
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tpercentnode2 = nodearraylist1
+                                       assert tpercentnode2 isa nullable TPercent
+                                       var pmethidnode1: nullable APercentMethid = new APercentMethid.init_apercentmethid(
+                                               tpercentnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction413
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tpipenode2 = nodearraylist1
+                                       assert tpipenode2 isa nullable TPipe
+                                       var pmethidnode1: nullable APipeMethid = new APipeMethid.init_apipemethid(
+                                               tpipenode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction414
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tcaretnode2 = nodearraylist1
+                                       assert tcaretnode2 isa nullable TCaret
+                                       var pmethidnode1: nullable ACaretMethid = new ACaretMethid.init_acaretmethid(
+                                               tcaretnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction415
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pmethidnode1: nullable AAmpMethid = new AAmpMethid.init_aampmethid(
+                                               tampnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction416
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var ttildenode2 = nodearraylist1
+                                       assert ttildenode2 isa nullable TTilde
+                                       var pmethidnode1: nullable ATildeMethid = new ATildeMethid.init_atildemethid(
+                                               ttildenode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction417
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var teqnode2 = nodearraylist1
+                                       assert teqnode2 isa nullable TEq
+                                       var pmethidnode1: nullable AEqMethid = new AEqMethid.init_aeqmethid(
+                                               teqnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction418
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tnenode2 = nodearraylist1
+                                       assert tnenode2 isa nullable TNe
+                                       var pmethidnode1: nullable ANeMethid = new ANeMethid.init_anemethid(
+                                               tnenode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction419
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tlenode2 = nodearraylist1
+                                       assert tlenode2 isa nullable TLe
+                                       var pmethidnode1: nullable ALeMethid = new ALeMethid.init_alemethid(
+                                               tlenode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction420
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tgenode2 = nodearraylist1
+                                       assert tgenode2 isa nullable TGe
+                                       var pmethidnode1: nullable AGeMethid = new AGeMethid.init_agemethid(
+                                               tgenode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction421
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tltnode2 = nodearraylist1
+                                       assert tltnode2 isa nullable TLt
+                                       var pmethidnode1: nullable ALtMethid = new ALtMethid.init_altmethid(
+                                               tltnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction422
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tgtnode2 = nodearraylist1
+                                       assert tgtnode2 isa nullable TGt
+                                       var pmethidnode1: nullable AGtMethid = new AGtMethid.init_agtmethid(
+                                               tgtnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction423
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tllnode2 = nodearraylist1
+                                       assert tllnode2 isa nullable TLl
+                                       var pmethidnode1: nullable ALlMethid = new ALlMethid.init_allmethid(
+                                               tllnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction424
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tggnode2 = nodearraylist1
+                                       assert tggnode2 isa nullable TGg
+                                       var pmethidnode1: nullable AGgMethid = new AGgMethid.init_aggmethid(
+                                               tggnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction425
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var tcbranode3 = nodearraylist2
+                                       assert tcbranode3 isa nullable TCbra
+                                       var pmethidnode1: nullable ABraMethid = new ABraMethid.init_abramethid(
+                                               tobranode2,
+                                               tcbranode3
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction426
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tstarshipnode2 = nodearraylist1
+                                       assert tstarshipnode2 isa nullable TStarship
+                                       var pmethidnode1: nullable AStarshipMethid = new AStarshipMethid.init_astarshipmethid(
+                                               tstarshipnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction427
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var tassignnode3 = nodearraylist2
+                                       assert tassignnode3 isa nullable TAssign
+                                       var pmethidnode1: nullable AAssignMethid = new AAssignMethid.init_aassignmethid(
+                                               tidnode2,
+                                               tassignnode3
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction428
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var tcbranode3 = nodearraylist2
+                                       assert tcbranode3 isa nullable TCbra
+                                       var tassignnode4 = nodearraylist3
+                                       assert tassignnode4 isa nullable TAssign
+                                       var pmethidnode1: nullable ABraassignMethid = new ABraassignMethid.init_abraassignmethid(
+                                               tobranode2,
+                                               tcbranode3,
+                                               tassignnode4
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction429
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var pmethidnode1: nullable AIdMethid = new AIdMethid.init_aidmethid(
+                                               tidnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction430
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcparnode5 = nodearraylist4
+                                       assert tcparnode5 isa nullable TCpar
+                                       var ptypenode6 = nodearraylist5
+                                       assert ptypenode6 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               toparnode2,
+                                               listnode4,
+                                               tcparnode5,
+                                               ptypenode6
+                                       )
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction431
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcparnode5 = nodearraylist4
+                                       assert tcparnode5 isa nullable TCpar
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               toparnode2,
+                                               listnode4,
+                                               tcparnode5,
+                                               null
+                                       )
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction432
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var ptypenode5 = nodearraylist1
+                                       assert ptypenode5 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode3,
+                                               null,
+                                               ptypenode5
+                                       )
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction433
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               null,
+                                               listnode3,
+                                               null,
+                                               null
+                                       )
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction434
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pparamnode1 = nodearraylist1
+                                       if pparamnode1 != null then
+                                               listnode2.add(pparamnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction435
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pparamnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pparamnode1 != null then
+                                               listnode3.add(pparamnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction437
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pparamnode1 = nodearraylist3
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction438
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var pannotationsnode5 = nodearraylist2
+                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
+                                               null,
+                                               null,
+                                               pannotationsnode5
+                                       )
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction439
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var ptypenode3 = nodearraylist2
+                                       assert ptypenode3 isa nullable AType
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
+                                               ptypenode3,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction440
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var pannotationsnode5 = nodearraylist2
+                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
+                                               ptypenode3,
+                                               null,
+                                               pannotationsnode5
+                                       )
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction441
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var ptypenode3 = nodearraylist2
+                                       assert ptypenode3 isa nullable AType
+                                       var tdotdotdotnode4 = nodearraylist3
+                                       assert tdotdotdotnode4 isa nullable TDotdotdot
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
+                                               ptypenode3,
+                                               tdotdotdotnode4,
+                                               null
+                                       )
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction442
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var tdotdotdotnode4 = nodearraylist4
+                                       assert tdotdotdotnode4 isa nullable TDotdotdot
+                                       var pannotationsnode5 = nodearraylist2
+                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
+                                               ptypenode3,
+                                               tdotdotdotnode4,
+                                               pannotationsnode5
+                                       )
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction443
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var tkwimportnode2 = nodearraylist1
+                                       assert tkwimportnode2 isa nullable TKwimport
+                                       var pexterncallnode3 = nodearraylist3
+                                       assert pexterncallnode3 isa nullable AExternCall
+                                       if pexterncallnode3 != null then
+                                               listnode4.add(pexterncallnode3)
+                                       end
+                                       var pexterncallsnode1: nullable AExternCalls = new AExternCalls.init_aexterncalls(
+                                               tkwimportnode2,
+                                               listnode4
+                                       )
+                                       node_list = pexterncallsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction444
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var tkwimportnode2 = nodearraylist1
+                                       assert tkwimportnode2 isa nullable TKwimport
+                                       var pexterncallnode3 = nodearraylist3
+                                       assert pexterncallnode3 isa nullable AExternCall
+                                       var listnode4 = nodearraylist4
+                                       assert listnode4 isa Array[Object]
+                                       if pexterncallnode3 != null then
+                                               listnode5.add(pexterncallnode3)
+                                       end
+                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexterncallsnode1: nullable AExternCalls = new AExternCalls.init_aexterncalls(
+                                               tkwimportnode2,
+                                               listnode5
+                                       )
+                                       node_list = pexterncallsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction446
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexterncallnode1 = nodearraylist3
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction447
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexterncallnode1 = nodearraylist1
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction449
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwsupernode2 = nodearraylist1
+                                       assert tkwsupernode2 isa nullable TKwsuper
+                                       var pexterncallnode1: nullable ASuperExternCall = new ASuperExternCall.init_asuperexterncall(
+                                               tkwsupernode2
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction450
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pmethidnode2 = nodearraylist1
+                                       assert pmethidnode2 isa nullable AMethid
+                                       var pexterncallnode1: nullable ALocalPropExternCall = new ALocalPropExternCall.init_alocalpropexterncall(
+                                               pmethidnode2
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction451
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tdotnode3 = nodearraylist2
+                                       assert tdotnode3 isa nullable TDot
+                                       var pmethidnode4 = nodearraylist3
+                                       assert pmethidnode4 isa nullable AMethid
+                                       var pexterncallnode1: nullable AFullPropExternCall = new AFullPropExternCall.init_afullpropexterncall(
+                                               ptypenode2,
+                                               tdotnode3,
+                                               pmethidnode4
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction452
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var pexterncallnode1: nullable AInitPropExternCall = new AInitPropExternCall.init_ainitpropexterncall(
+                                               ptypenode2
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction453
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tdotnode3 = nodearraylist2
+                                       assert tdotnode3 isa nullable TDot
+                                       var tkwasnode4 = nodearraylist3
+                                       assert tkwasnode4 isa nullable TKwas
+                                       var ptypenode5 = nodearraylist7
+                                       assert ptypenode5 isa nullable AType
+                                       var pexterncallnode1: nullable ACastAsExternCall = new ACastAsExternCall.init_acastasexterncall(
+                                               ptypenode2,
+                                               tdotnode3,
+                                               tkwasnode4,
+                                               ptypenode5
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction454
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tdotnode3 = nodearraylist2
+                                       assert tdotnode3 isa nullable TDot
+                                       var tkwasnode4 = nodearraylist3
+                                       assert tkwasnode4 isa nullable TKwas
+                                       var ptypenode5 = nodearraylist5
+                                       assert ptypenode5 isa nullable AType
+                                       var pexterncallnode1: nullable ACastAsExternCall = new ACastAsExternCall.init_acastasexterncall(
+                                               ptypenode2,
+                                               tdotnode3,
+                                               tkwasnode4,
+                                               ptypenode5
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction455
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tkwasnode3 = nodearraylist3
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnullablenode4 = nodearraylist7
+                                       assert tkwnullablenode4 isa nullable TKwnullable
+                                       var pexterncallnode1: nullable AAsNullableExternCall = new AAsNullableExternCall.init_aasnullableexterncall(
+                                               ptypenode2,
+                                               tkwasnode3,
+                                               tkwnullablenode4
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction456
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tkwasnode3 = nodearraylist3
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnullablenode4 = nodearraylist5
+                                       assert tkwnullablenode4 isa nullable TKwnullable
+                                       var pexterncallnode1: nullable AAsNullableExternCall = new AAsNullableExternCall.init_aasnullableexterncall(
+                                               ptypenode2,
+                                               tkwasnode3,
+                                               tkwnullablenode4
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction457
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tkwasnode3 = nodearraylist3
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist7
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullablenode5 = nodearraylist9
+                                       assert tkwnullablenode5 isa nullable TKwnullable
+                                       var pexterncallnode1: nullable AAsNotNullableExternCall = new AAsNotNullableExternCall.init_aasnotnullableexterncall(
+                                               ptypenode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullablenode5
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction458
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var tkwasnode3 = nodearraylist3
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist5
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullablenode5 = nodearraylist7
+                                       assert tkwnullablenode5 isa nullable TKwnullable
+                                       var pexterncallnode1: nullable AAsNotNullableExternCall = new AAsNotNullableExternCall.init_aasnotnullableexterncall(
+                                               ptypenode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullablenode5
+                                       )
+                                       node_list = pexterncallnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction460
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tstringnode1 = nodearraylist1
+                                       node_list = tstringnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction461
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwinnode2 = nodearraylist1
+                                       assert tkwinnode2 isa nullable TKwin
+                                       var tstringnode3 = nodearraylist3
+                                       assert tstringnode3 isa nullable TString
+                                       var pinlanguagenode1: nullable AInLanguage = new AInLanguage.init_ainlanguage(
+                                               tkwinnode2,
+                                               tstringnode3
+                                       )
+                                       node_list = pinlanguagenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction462
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var texterncodesegmentnode3 = nodearraylist1
+                                       assert texterncodesegmentnode3 isa nullable TExternCodeSegment
+                                       var pexterncodeblocknode1: nullable AExternCodeBlock = new AExternCodeBlock.init_aexterncodeblock(
+                                               null,
+                                               texterncodesegmentnode3
+                                       )
+                                       node_list = pexterncodeblocknode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction463
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pinlanguagenode2 = nodearraylist1
+                                       assert pinlanguagenode2 isa nullable AInLanguage
+                                       var texterncodesegmentnode3 = nodearraylist2
+                                       assert texterncodesegmentnode3 isa nullable TExternCodeSegment
+                                       var pexterncodeblocknode1: nullable AExternCodeBlock = new AExternCodeBlock.init_aexterncodeblock(
+                                               pinlanguagenode2,
+                                               texterncodesegmentnode3
+                                       )
+                                       node_list = pexterncodeblocknode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction464
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexterncodeblocknode1 = nodearraylist1
+                                       node_list = pexterncodeblocknode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction466
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexterncodeblocknode1 = nodearraylist2
+                                       node_list = pexterncodeblocknode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction467
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode1 = nodearraylist1
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction468
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode1 = nodearraylist1
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction470
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var pqclassidnode3 = nodearraylist1
+                                       assert pqclassidnode3 isa nullable AQclassid
+                                       var pannotationsnode7 = nodearraylist2
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var ptypenode1: nullable AType = new AType.init_atype(
+                                               null,
+                                               pqclassidnode3,
+                                               null,
+                                               listnode5,
+                                               null,
+                                               pannotationsnode7
+                                       )
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction471
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var tkwnullablenode2 = nodearraylist1
+                                       assert tkwnullablenode2 isa nullable TKwnullable
+                                       var pqclassidnode3 = nodearraylist2
+                                       assert pqclassidnode3 isa nullable AQclassid
+                                       var pannotationsnode7 = nodearraylist3
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var ptypenode1: nullable AType = new AType.init_atype(
+                                               tkwnullablenode2,
+                                               pqclassidnode3,
+                                               null,
+                                               listnode5,
+                                               null,
+                                               pannotationsnode7
+                                       )
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction472
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var pqclassidnode3 = nodearraylist1
+                                       assert pqclassidnode3 isa nullable AQclassid
+                                       var tobranode4 = nodearraylist2
+                                       assert tobranode4 isa nullable TObra
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcbranode7 = nodearraylist6
+                                       assert tcbranode7 isa nullable TCbra
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ptypenode1: nullable AType = new AType.init_atype(
+                                               null,
+                                               pqclassidnode3,
+                                               tobranode4,
+                                               listnode6,
+                                               tcbranode7,
+                                               pannotationsnode8
+                                       )
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction473
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tkwnullablenode2 = nodearraylist1
+                                       assert tkwnullablenode2 isa nullable TKwnullable
+                                       var pqclassidnode3 = nodearraylist2
+                                       assert pqclassidnode3 isa nullable AQclassid
+                                       var tobranode4 = nodearraylist3
+                                       assert tobranode4 isa nullable TObra
+                                       var listnode5 = nodearraylist5
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcbranode7 = nodearraylist7
+                                       assert tcbranode7 isa nullable TCbra
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var ptypenode1: nullable AType = new AType.init_atype(
+                                               tkwnullablenode2,
+                                               pqclassidnode3,
+                                               tobranode4,
+                                               listnode6,
+                                               tcbranode7,
+                                               pannotationsnode8
+                                       )
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction474
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var ptypenode1 = nodearraylist1
+                                       if ptypenode1 != null then
+                                               listnode2.add(ptypenode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction475
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var ptypenode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if ptypenode1 != null then
+                                               listnode3.add(ptypenode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction476
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode1 = nodearraylist3
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction480
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist2
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction481
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var tkwendnode3 = nodearraylist2
+                                       assert tkwendnode3 isa nullable TKwend
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2,
+                                               tkwendnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction482
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var tkwendnode3 = nodearraylist1
+                                       assert tkwendnode3 isa nullable TKwend
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2,
+                                               tkwendnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction483
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction484
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction485
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+                                       if pexprnode2 != null then
+                                               listnode4.add(pexprnode2)
+                                       end
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction486
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       var tkwendnode4 = nodearraylist3
+                                       assert tkwendnode4 isa nullable TKwend
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode3,
+                                               tkwendnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction487
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+                                       if pexprnode2 != null then
+                                               listnode4.add(pexprnode2)
+                                       end
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tkwendnode5 = nodearraylist4
+                                       assert tkwendnode5 isa nullable TKwend
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4,
+                                               tkwendnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction491
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwreturnnode2 = nodearraylist1
+                                       assert tkwreturnnode2 isa nullable TKwreturn
+                                       var pexprnode1: nullable AReturnExpr = new AReturnExpr.init_areturnexpr(
+                                               tkwreturnnode2,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction492
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwreturnnode2 = nodearraylist1
+                                       assert tkwreturnnode2 isa nullable TKwreturn
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AReturnExpr = new AReturnExpr.init_areturnexpr(
+                                               tkwreturnnode2,
+                                               pexprnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction493
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwyieldnode2 = nodearraylist1
+                                       assert tkwyieldnode2 isa nullable TKwyield
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AYieldExpr = new AYieldExpr.init_ayieldexpr(
+                                               tkwyieldnode2,
+                                               pexprnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction494
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
+                                               tkwbreaknode2,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction495
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var plabelnode3 = nodearraylist2
+                                       assert plabelnode3 isa nullable ALabel
+                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
+                                               tkwbreaknode2,
+                                               plabelnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction496
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwabortnode2 = nodearraylist1
+                                       assert tkwabortnode2 isa nullable TKwabort
+                                       var pexprnode1: nullable AAbortExpr = new AAbortExpr.init_aabortexpr(
+                                               tkwabortnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction497
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction498
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var plabelnode3 = nodearraylist2
+                                       assert plabelnode3 isa nullable ALabel
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               plabelnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction506
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20595,30 +22615,26 @@ private class ReduceAction461
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwtypenode5 = nodearraylist3
-                                       assert tkwtypenode5 isa nullable TKwtype
-                                       var tclassidnode6 = nodearraylist4
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var ptypenode7 = nodearraylist5
-                                       assert ptypenode7 isa nullable AType
-                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7,
-                                               null
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode6 = nodearraylist5
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction462
+private class ReduceAction507
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20629,107 +22645,112 @@ private class ReduceAction462
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwtypenode5 = nodearraylist4
-                                       assert tkwtypenode5 isa nullable TKwtype
-                                       var tclassidnode6 = nodearraylist5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
                                        assert tclassidnode6 isa nullable TClassid
-                                       var ptypenode7 = nodearraylist6
-                                       assert ptypenode7 isa nullable AType
-                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7,
-                                               null
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction463
+private class ReduceAction508
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwtypenode5 = nodearraylist3
-                                       assert tkwtypenode5 isa nullable TKwtype
-                                       var tclassidnode6 = nodearraylist4
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var ptypenode7 = nodearraylist5
-                                       assert ptypenode7 isa nullable AType
-                                       var pannotationsnode8 = nodearraylist6
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7,
-                                               pannotationsnode8
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist7
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction464
+private class ReduceAction509
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwtypenode5 = nodearraylist4
-                                       assert tkwtypenode5 isa nullable TKwtype
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa nullable TClassid
-                                       var ptypenode7 = nodearraylist6
-                                       assert ptypenode7 isa nullable AType
-                                       var pannotationsnode8 = nodearraylist7
-                                       assert pannotationsnode8 isa nullable AAnnotations
-                                       var ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7,
-                                               pannotationsnode8
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist6
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction465
+private class ReduceAction510
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20740,30 +22761,32 @@ private class ReduceAction465
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               null
+                                               tidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction466
+private class ReduceAction511
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -20775,36 +22798,44 @@ private class ReduceAction466
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist7
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction467
+private class ReduceAction512
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20812,37 +22843,46 @@ private class ReduceAction467
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist8
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction468
+private class ReduceAction513
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20850,400 +22890,300 @@ private class ReduceAction468
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               null,
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
                                                null
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist7
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction469
+private class ReduceAction514
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               null
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode6 = nodearraylist2
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction470
+private class ReduceAction515
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               null
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist3
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction471
+private class ReduceAction516
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               null
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist4
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction472
+private class ReduceAction517
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
                                                null
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist3
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction473
+private class ReduceAction518
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               null
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var pexprsnode4 = nodearraylist3
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction474
+private class ReduceAction519
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction475
+private class ReduceAction520
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var tkwinitnode5 = nodearraylist5
+                                       assert tkwinitnode5 isa nullable TKwinit
+                                       var pexprsnode6 = nodearraylist6
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode5,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction476
+private class ReduceAction521
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction477
+private class ReduceAction522
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist5
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist6
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction478
+private class ReduceAction523
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21251,42 +23191,26 @@ private class ReduceAction478
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist6
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist7
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction479
+private class ReduceAction525
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21294,42 +23218,32 @@ private class ReduceAction479
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var tkwinitnode5 = nodearraylist6
+                                       assert tkwinitnode5 isa nullable TKwinit
+                                       var pexprsnode6 = nodearraylist7
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode5,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction480
+private class ReduceAction526
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -21338,331 +23252,228 @@ private class ReduceAction480
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tkwinitnode5 = nodearraylist7
+                                       assert tkwinitnode5 isa nullable TKwinit
+                                       var pexprsnode6 = nodearraylist8
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode5,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction528
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tkwinitnode3 = nodearraylist2
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist3
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction481
+private class ReduceAction529
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tkwinitnode3 = nodearraylist3
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist4
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction482
+private class ReduceAction531
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var tkwdebugnode2 = nodearraylist1
+                                       assert tkwdebugnode2 isa nullable TKwdebug
+                                       var tkwtypenode3 = nodearraylist2
+                                       assert tkwtypenode3 isa nullable TKwtype
+                                       var pexprnode4 = nodearraylist5
+                                       assert pexprnode4 isa nullable AExpr
+                                       var ptypenode5 = nodearraylist3
+                                       assert ptypenode5 isa nullable AType
+                                       var pexprnode1: nullable ADebugTypeExpr = new ADebugTypeExpr.init_adebugtypeexpr(
+                                               tkwdebugnode2,
+                                               tkwtypenode3,
+                                               pexprnode4,
+                                               ptypenode5
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction483
+private class ReduceAction532
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var tkwlabelnode2 = nodearraylist1
+                                       assert tkwlabelnode2 isa nullable TKwlabel
+                                       var plabelnode1: nullable ALabel = new ALabel.init_alabel(
+                                               tkwlabelnode2,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = plabelnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction484
+private class ReduceAction533
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var tkwlabelnode2 = nodearraylist1
+                                       assert tkwlabelnode2 isa nullable TKwlabel
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var plabelnode1: nullable ALabel = new ALabel.init_alabel(
+                                               tkwlabelnode2,
+                                               tidnode3
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = plabelnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction485
+private class ReduceAction534
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
+                                       var tkwvarnode2 = nodearraylist1
+                                       assert tkwvarnode2 isa nullable TKwvar
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist3
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
+                                               tkwvarnode2,
+                                               tidnode3,
+                                               ptypenode4,
                                                null,
-                                               psignaturenode7,
-                                               tstringnode8,
                                                null,
-                                               pexterncodeblocknode10
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction486
+private class ReduceAction535
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
+                                       var tkwvarnode2 = nodearraylist1
+                                       assert tkwvarnode2 isa nullable TKwvar
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist4
+                                       assert ptypenode4 isa nullable AType
+                                       var pannotationsnode7 = nodearraylist3
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
+                                               tkwvarnode2,
+                                               tidnode3,
+                                               ptypenode4,
                                                null,
-                                               psignaturenode7,
-                                               tstringnode8,
                                                null,
-                                               pexterncodeblocknode10
+                                               pannotationsnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction487
+private class ReduceAction536
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var tkwvarnode2 = nodearraylist1
+                                       assert tkwvarnode2 isa nullable TKwvar
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist3
+                                       assert ptypenode4 isa nullable AType
+                                       var tassignnode5 = nodearraylist4
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist6
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
+                                               tkwvarnode2,
+                                               tidnode3,
+                                               ptypenode4,
+                                               tassignnode5,
+                                               pexprnode6,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction488
+private class ReduceAction537
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21670,43 +23481,35 @@ private class ReduceAction488
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var tkwvarnode2 = nodearraylist1
+                                       assert tkwvarnode2 isa nullable TKwvar
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist4
+                                       assert ptypenode4 isa nullable AType
+                                       var tassignnode5 = nodearraylist5
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pannotationsnode7 = nodearraylist3
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
+                                               tkwvarnode2,
+                                               tidnode3,
+                                               ptypenode4,
+                                               tassignnode5,
+                                               pexprnode6,
+                                               pannotationsnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction489
+private class ReduceAction538
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21714,39 +23517,29 @@ private class ReduceAction489
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tattridnode3 = nodearraylist5
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var tassignnode4 = nodearraylist6
+                                       assert tassignnode4 isa nullable TAssign
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
+                                               pexprnode2,
+                                               tattridnode3,
+                                               tassignnode4,
+                                               pexprnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction490
+private class ReduceAction539
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -21755,86 +23548,61 @@ private class ReduceAction490
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var tattridnode5 = nodearraylist6
+                                       assert tattridnode5 isa nullable TAttrid
+                                       var tassignnode6 = nodearraylist7
+                                       assert tassignnode6 isa nullable TAssign
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
+                                               pexprnode2,
+                                               tattridnode5,
+                                               tassignnode6,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction491
+private class ReduceAction540
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tattridnode3 = nodearraylist2
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var tassignnode4 = nodearraylist3
+                                       assert tassignnode4 isa nullable TAssign
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
+                                               pexprnode2,
+                                               tattridnode3,
+                                               tassignnode4,
+                                               pexprnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction492
+private class ReduceAction541
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21842,87 +23610,74 @@ private class ReduceAction492
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode6 = nodearraylist5
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var tassignnode7 = nodearraylist6
+                                       assert tassignnode7 isa nullable TAssign
+                                       var pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               tassignnode7,
+                                               pexprnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction493
+private class ReduceAction542
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var tassignnode8 = nodearraylist5
+                                       assert tassignnode8 isa nullable TAssign
+                                       var pexprnode9 = nodearraylist6
+                                       assert pexprnode9 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               tassignnode8,
+                                               pexprnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction494
+private class ReduceAction543
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -21931,45 +23686,43 @@ private class ReduceAction494
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               tassignnode9,
+                                               pexprnode10
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction495
+private class ReduceAction544
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21977,44 +23730,45 @@ private class ReduceAction495
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var tassignnode10 = nodearraylist6
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               tassignnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction496
+private class ReduceAction545
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -22024,155 +23778,190 @@ private class ReduceAction496
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist11
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist7
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var tassignnode10 = nodearraylist8
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode10,
+                                               pexprnode11
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction497
+private class ReduceAction546
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist5
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var tassignnode11 = nodearraylist7
+                                       assert tassignnode11 isa nullable TAssign
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction498
+private class ReduceAction547
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist6
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist6
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var tassignnode10 = nodearraylist7
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction499
+private class ReduceAction548
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist6
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var tassignnode11 = nodearraylist6
+                                       assert tassignnode11 isa nullable TAssign
+                                       var pexprnode12 = nodearraylist7
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction500
+private class ReduceAction549
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22180,78 +23969,89 @@ private class ReduceAction500
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pexterncodeblocknode10
+                                               tidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var tassignnode9 = nodearraylist7
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8,
+                                               tassignnode9,
+                                               pexprnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction501
+private class ReduceAction550
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist5
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist6
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pexterncodeblocknode10
+                                               tidnode7
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var tassignnode10 = nodearraylist6
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8,
+                                               tassignnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction502
+private class ReduceAction551
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22259,40 +24059,50 @@ private class ReduceAction502
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist6
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist7
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var tassignnode11 = nodearraylist8
+                                       assert tassignnode11 isa nullable TAssign
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10,
+                                               tassignnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction503
+private class ReduceAction552
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22300,40 +24110,53 @@ private class ReduceAction503
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist6
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var tassignnode12 = nodearraylist7
+                                       assert tassignnode12 isa nullable TAssign
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10,
+                                               tassignnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction504
+private class ReduceAction553
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -22342,80 +24165,111 @@ private class ReduceAction504
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               null,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist8
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var tassignnode12 = nodearraylist9
+                                       assert tassignnode12 isa nullable TAssign
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               tassignnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction505
+private class ReduceAction554
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist5
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist6
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var tassignnode13 = nodearraylist8
+                                       assert tassignnode13 isa nullable TAssign
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               tassignnode13,
+                                               pexprnode14
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction506
+private class ReduceAction555
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22423,40 +24277,51 @@ private class ReduceAction506
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist6
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               null
+                                       )
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist7
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var tassignnode12 = nodearraylist8
+                                       assert tassignnode12 isa nullable TAssign
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               tassignnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction507
+private class ReduceAction556
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22464,1096 +24329,1784 @@ private class ReduceAction507
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist6
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               null
+                                       )
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var tassignnode13 = nodearraylist7
+                                       assert tassignnode13 isa nullable TAssign
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               tassignnode13,
+                                               pexprnode14
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction508
+private class ReduceAction557
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var pexprsnode6 = nodearraylist2
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var tassignnode7 = nodearraylist3
+                                       assert tassignnode7 isa nullable TAssign
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               tassignnode7,
+                                               pexprnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction509
+private class ReduceAction558
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist5
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist6
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist7
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               tidnode5
                                        )
-                                       node_list = ppropdefnode1
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var tassignnode8 = nodearraylist2
+                                       assert tassignnode8 isa nullable TAssign
+                                       var pexprnode9 = nodearraylist3
+                                       assert pexprnode9 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               tassignnode8,
+                                               pexprnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction510
+private class ReduceAction559
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist6
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               null,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist3
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var tassignnode9 = nodearraylist4
+                                       assert tassignnode9 isa nullable TAssign
+                                       var pexprnode10 = nodearraylist5
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               tassignnode9,
+                                               pexprnode10
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction511
+private class ReduceAction560
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist3
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist6
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
                                        )
-                                       node_list = ppropdefnode1
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var tassignnode10 = nodearraylist3
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist4
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               tassignnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction512
+private class ReduceAction561
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa nullable ADoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa nullable TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa nullable AVisibility
-                                       var tkwnewnode5 = nodearraylist4
-                                       assert tkwnewnode5 isa nullable TKwnew
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa nullable AMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
-                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwnewnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist4
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var tassignnode10 = nodearraylist5
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist6
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode10,
+                                               pexprnode11
                                        )
-                                       node_list = ppropdefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction513
+private class ReduceAction562
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist2
-                                       node_list = pannotationsnode1
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var tassignnode11 = nodearraylist4
+                                       assert tassignnode11 isa nullable TAssign
+                                       var pexprnode12 = nodearraylist5
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction514
+private class ReduceAction563
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
-                                       node_list = pannotationsnode1
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
+                                       )
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist3
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var tassignnode10 = nodearraylist4
+                                       assert tassignnode10 isa nullable TAssign
+                                       var pexprnode11 = nodearraylist5
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction516
+private class ReduceAction564
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
-                                       node_list = pannotationsnode1
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
+                                       )
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var tassignnode11 = nodearraylist3
+                                       assert tassignnode11 isa nullable TAssign
+                                       var pexprnode12 = nodearraylist4
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               tassignnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction517
+private class ReduceAction565
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreadablenode3 = nodearraylist1
-                                       assert tkwreadablenode3 isa nullable TKwreadable
-                                       var pablenode1: nullable AReadAble = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var tassignnode4 = nodearraylist3
+                                       assert tassignnode4 isa nullable TAssign
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable ABraAssignExpr = new ABraAssignExpr.init_abraassignexpr(
+                                               pexprnode2,
+                                               pexprsnode3,
+                                               tassignnode4,
+                                               pexprnode5
                                        )
-                                       node_list = pablenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction518
+private class ReduceAction566
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwredefnode2 = nodearraylist1
-                                       assert tkwredefnode2 isa nullable TKwredef
-                                       var tkwreadablenode3 = nodearraylist2
-                                       assert tkwreadablenode3 isa nullable TKwreadable
-                                       var pablenode1: nullable AReadAble = new AReadAble.init_areadable(
-                                               tkwredefnode2,
-                                               tkwreadablenode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tattridnode3 = nodearraylist5
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var passignopnode4 = nodearraylist6
+                                       assert passignopnode4 isa nullable AAssignOp
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
+                                               pexprnode2,
+                                               tattridnode3,
+                                               passignopnode4,
+                                               pexprnode5
                                        )
-                                       node_list = pablenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction519
+private class ReduceAction567
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwritablenode4 = nodearraylist1
-                                       assert tkwwritablenode4 isa nullable TKwwritable
-                                       var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
-                                               null,
-                                               null,
-                                               tkwwritablenode4
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pablenode1
+                                       var tattridnode5 = nodearraylist6
+                                       assert tattridnode5 isa nullable TAttrid
+                                       var passignopnode6 = nodearraylist7
+                                       assert passignopnode6 isa nullable AAssignOp
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
+                                               pexprnode2,
+                                               tattridnode5,
+                                               passignopnode6,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction520
+private class ReduceAction568
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwredefnode2 = nodearraylist1
-                                       assert tkwredefnode2 isa nullable TKwredef
-                                       var tkwwritablenode4 = nodearraylist2
-                                       assert tkwwritablenode4 isa nullable TKwwritable
-                                       var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
-                                               tkwredefnode2,
-                                               null,
-                                               tkwwritablenode4
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tattridnode3 = nodearraylist2
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var passignopnode4 = nodearraylist3
+                                       assert passignopnode4 isa nullable AAssignOp
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
+                                               pexprnode2,
+                                               tattridnode3,
+                                               passignopnode4,
+                                               pexprnode5
                                        )
-                                       node_list = pablenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction521
+private class ReduceAction569
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pvisibilitynode3 = nodearraylist1
-                                       assert pvisibilitynode3 isa nullable AVisibility
-                                       var tkwwritablenode4 = nodearraylist2
-                                       assert tkwwritablenode4 isa nullable TKwwritable
-                                       var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pvisibilitynode3,
-                                               tkwwritablenode4
+                                               tidnode5
+                                       )
+                                       var pexprsnode6 = nodearraylist5
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var passignopnode7 = nodearraylist6
+                                       assert passignopnode7 isa nullable AAssignOp
+                                       var pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               passignopnode7,
+                                               pexprnode8
                                        )
-                                       node_list = pablenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction522
+private class ReduceAction570
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var 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
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
+                                       )
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var passignopnode8 = nodearraylist5
+                                       assert passignopnode8 isa nullable AAssignOp
+                                       var pexprnode9 = nodearraylist6
+                                       assert pexprnode9 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               passignopnode8,
+                                               pexprnode9
                                        )
-                                       node_list = pablenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction523
+private class ReduceAction571
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility
-                                       node_list = pvisibilitynode1
+                                       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 pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var passignopnode9 = nodearraylist7
+                                       assert passignopnode9 isa nullable AAssignOp
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               passignopnode9,
+                                               pexprnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction524
+private class ReduceAction572
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwprivatenode2 = nodearraylist1
-                                       assert tkwprivatenode2 isa nullable TKwprivate
-                                       var pvisibilitynode1: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
-                                               tkwprivatenode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var passignopnode10 = nodearraylist6
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               passignopnode10,
+                                               pexprnode11
                                        )
-                                       node_list = pvisibilitynode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction525
+private class ReduceAction573
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwprotectednode2 = nodearraylist1
-                                       assert tkwprotectednode2 isa nullable TKwprotected
-                                       var pvisibilitynode1: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
-                                               tkwprotectednode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist7
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var passignopnode10 = nodearraylist8
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode10,
+                                               pexprnode11
                                        )
-                                       node_list = pvisibilitynode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction526
+private class ReduceAction574
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwintrudenode2 = nodearraylist1
-                                       assert tkwintrudenode2 isa nullable TKwintrude
-                                       var pvisibilitynode1: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
-                                               tkwintrudenode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = pvisibilitynode1
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var passignopnode11 = nodearraylist7
+                                       assert passignopnode11 isa nullable AAssignOp
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction527
+private class ReduceAction575
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var pmethidnode1: nullable AIdMethid = new AIdMethid.init_aidmethid(
-                                               tidnode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist6
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var passignopnode10 = nodearraylist7
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction528
+private class ReduceAction576
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tplusnode2 = nodearraylist1
-                                       assert tplusnode2 isa nullable TPlus
-                                       var pmethidnode1: nullable APlusMethid = new APlusMethid.init_aplusmethid(
-                                               tplusnode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var passignopnode11 = nodearraylist6
+                                       assert passignopnode11 isa nullable AAssignOp
+                                       var pexprnode12 = nodearraylist7
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction529
+private class ReduceAction577
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa nullable TMinus
-                                       var pmethidnode1: nullable AMinusMethid = new AMinusMethid.init_aminusmethid(
-                                               tminusnode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist6
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var passignopnode9 = nodearraylist7
+                                       assert passignopnode9 isa nullable AAssignOp
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8,
+                                               passignopnode9,
+                                               pexprnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction530
+private class ReduceAction578
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstarnode2 = nodearraylist1
-                                       assert tstarnode2 isa nullable TStar
-                                       var pmethidnode1: nullable AStarMethid = new AStarMethid.init_astarmethid(
-                                               tstarnode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var passignopnode10 = nodearraylist6
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8,
+                                               passignopnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction531
+private class ReduceAction579
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tslashnode2 = nodearraylist1
-                                       assert tslashnode2 isa nullable TSlash
-                                       var pmethidnode1: nullable ASlashMethid = new ASlashMethid.init_aslashmethid(
-                                               tslashnode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist7
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var passignopnode11 = nodearraylist8
+                                       assert passignopnode11 isa nullable AAssignOp
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10,
+                                               passignopnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction532
+private class ReduceAction580
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tpercentnode2 = nodearraylist1
-                                       assert tpercentnode2 isa nullable TPercent
-                                       var pmethidnode1: nullable APercentMethid = new APercentMethid.init_apercentmethid(
-                                               tpercentnode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var passignopnode12 = nodearraylist7
+                                       assert passignopnode12 isa nullable AAssignOp
+                                       var pexprnode13 = nodearraylist8
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10,
+                                               passignopnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction533
+private class ReduceAction581
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var teqnode2 = nodearraylist1
-                                       assert teqnode2 isa nullable TEq
-                                       var pmethidnode1: nullable AEqMethid = new AEqMethid.init_aeqmethid(
-                                               teqnode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist8
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var passignopnode12 = nodearraylist9
+                                       assert passignopnode12 isa nullable AAssignOp
+                                       var pexprnode13 = nodearraylist10
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               passignopnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction534
+private class ReduceAction582
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tnenode2 = nodearraylist1
-                                       assert tnenode2 isa nullable TNe
-                                       var pmethidnode1: nullable ANeMethid = new ANeMethid.init_anemethid(
-                                               tnenode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var passignopnode13 = nodearraylist8
+                                       assert passignopnode13 isa nullable AAssignOp
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               passignopnode13,
+                                               pexprnode14
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction535
+private class ReduceAction583
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tlenode2 = nodearraylist1
-                                       assert tlenode2 isa nullable TLe
-                                       var pmethidnode1: nullable ALeMethid = new ALeMethid.init_alemethid(
-                                               tlenode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               null
+                                       )
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist7
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var passignopnode12 = nodearraylist8
+                                       assert passignopnode12 isa nullable AAssignOp
+                                       var pexprnode13 = nodearraylist9
+                                       assert pexprnode13 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               passignopnode12,
+                                               pexprnode13
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction536
+private class ReduceAction584
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tgenode2 = nodearraylist1
-                                       assert tgenode2 isa nullable TGe
-                                       var pmethidnode1: nullable AGeMethid = new AGeMethid.init_agemethid(
-                                               tgenode2
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               null
+                                       )
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var passignopnode13 = nodearraylist7
+                                       assert passignopnode13 isa nullable AAssignOp
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11,
+                                               passignopnode13,
+                                               pexprnode14
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction537
+private class ReduceAction585
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tltnode2 = nodearraylist1
-                                       assert tltnode2 isa nullable TLt
-                                       var pmethidnode1: nullable ALtMethid = new ALtMethid.init_altmethid(
-                                               tltnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
                                        )
-                                       node_list = pmethidnode1
+                                       var pexprsnode6 = nodearraylist2
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var passignopnode7 = nodearraylist3
+                                       assert passignopnode7 isa nullable AAssignOp
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               passignopnode7,
+                                               pexprnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction538
+private class ReduceAction586
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tgtnode2 = nodearraylist1
-                                       assert tgtnode2 isa nullable TGt
-                                       var pmethidnode1: nullable AGtMethid = new AGtMethid.init_agtmethid(
-                                               tgtnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
                                        )
-                                       node_list = pmethidnode1
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var passignopnode8 = nodearraylist2
+                                       assert passignopnode8 isa nullable AAssignOp
+                                       var pexprnode9 = nodearraylist3
+                                       assert pexprnode9 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6,
+                                               passignopnode8,
+                                               pexprnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction539
+private class ReduceAction587
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tllnode2 = nodearraylist1
-                                       assert tllnode2 isa nullable TLl
-                                       var pmethidnode1: nullable ALlMethid = new ALlMethid.init_allmethid(
-                                               tllnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist3
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var passignopnode9 = nodearraylist4
+                                       assert passignopnode9 isa nullable AAssignOp
+                                       var pexprnode10 = nodearraylist5
+                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               passignopnode9,
+                                               pexprnode10
                                        )
-                                       node_list = pmethidnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction540
+private class ReduceAction588
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tggnode2 = nodearraylist1
-                                       assert tggnode2 isa nullable TGg
-                                       var pmethidnode1: nullable AGgMethid = new AGgMethid.init_aggmethid(
-                                               tggnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var passignopnode10 = nodearraylist3
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist4
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8,
+                                               passignopnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction541
+private class ReduceAction589
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var tcbranode3 = nodearraylist2
-                                       assert tcbranode3 isa nullable TCbra
-                                       var pmethidnode1: nullable ABraMethid = new ABraMethid.init_abramethid(
-                                               tobranode2,
-                                               tcbranode3
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist4
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var passignopnode10 = nodearraylist5
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist6
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode10,
+                                               pexprnode11
                                        )
-                                       node_list = pmethidnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction542
+private class ReduceAction590
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstarshipnode2 = nodearraylist1
-                                       assert tstarshipnode2 isa nullable TStarship
-                                       var pmethidnode1: nullable AStarshipMethid = new AStarshipMethid.init_astarshipmethid(
-                                               tstarshipnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var passignopnode11 = nodearraylist4
+                                       assert passignopnode11 isa nullable AAssignOp
+                                       var pexprnode12 = nodearraylist5
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction543
+private class ReduceAction591
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var tassignnode3 = nodearraylist2
-                                       assert tassignnode3 isa nullable TAssign
-                                       var pmethidnode1: nullable AAssignMethid = new AAssignMethid.init_aassignmethid(
-                                               tidnode2,
-                                               tassignnode3
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist3
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var passignopnode10 = nodearraylist4
+                                       assert passignopnode10 isa nullable AAssignOp
+                                       var pexprnode11 = nodearraylist5
+                                       assert pexprnode11 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode10,
+                                               pexprnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction544
+private class ReduceAction592
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var tcbranode3 = nodearraylist2
-                                       assert tcbranode3 isa nullable TCbra
-                                       var tassignnode4 = nodearraylist3
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pmethidnode1: nullable ABraassignMethid = new ABraassignMethid.init_abraassignmethid(
-                                               tobranode2,
-                                               tcbranode3,
-                                               tassignnode4
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
                                        )
-                                       node_list = pmethidnode1
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var passignopnode11 = nodearraylist3
+                                       assert passignopnode11 isa nullable AAssignOp
+                                       var pexprnode12 = nodearraylist4
+                                       assert pexprnode12 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9,
+                                               passignopnode11,
+                                               pexprnode12
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction545
+private class ReduceAction593
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var ptypenode5 = nodearraylist4
-                                       assert ptypenode5 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
-                                               ptypenode5,
-                                               listnode6
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var passignopnode4 = nodearraylist3
+                                       assert passignopnode4 isa nullable AAssignOp
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable ABraReassignExpr = new ABraReassignExpr.init_abrareassignexpr(
+                                               pexprnode2,
+                                               pexprsnode3,
+                                               passignopnode4,
+                                               pexprnode5
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction546
+private class ReduceAction594
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var ptypenode6 = nodearraylist5
-                                       assert ptypenode6 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
-                                               ptypenode6,
-                                               listnode7
+                                       var tpluseqnode2 = nodearraylist1
+                                       assert tpluseqnode2 isa nullable TPluseq
+                                       var passignopnode1: nullable APlusAssignOp = new APlusAssignOp.init_aplusassignop(
+                                               tpluseqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction547
+private class ReduceAction595
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var ptypenode5 = nodearraylist4
-                                       assert ptypenode5 isa nullable AType
-                                       var listnode6 = nodearraylist6
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
-                                               ptypenode5,
-                                               listnode7
+                                       var tminuseqnode2 = nodearraylist1
+                                       assert tminuseqnode2 isa nullable TMinuseq
+                                       var passignopnode1: nullable AMinusAssignOp = new AMinusAssignOp.init_aminusassignop(
+                                               tminuseqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction548
+private class ReduceAction596
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var ptypenode6 = nodearraylist5
-                                       assert ptypenode6 isa nullable AType
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
-                                               ptypenode6,
-                                               listnode8
+                                       var tstareqnode2 = nodearraylist1
+                                       assert tstareqnode2 isa nullable TStareq
+                                       var passignopnode1: nullable AStarAssignOp = new AStarAssignOp.init_astarassignop(
+                                               tstareqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction549
+private class ReduceAction597
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
-                                               null,
-                                               listnode6
+                                       var tslasheqnode2 = nodearraylist1
+                                       assert tslasheqnode2 isa nullable TSlasheq
+                                       var passignopnode1: nullable ASlashAssignOp = new ASlashAssignOp.init_aslashassignop(
+                                               tslasheqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction550
+private class ReduceAction598
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
-                                               null,
-                                               listnode7
+                                       var tpercenteqnode2 = nodearraylist1
+                                       assert tpercenteqnode2 isa nullable TPercenteq
+                                       var passignopnode1: nullable APercentAssignOp = new APercentAssignOp.init_apercentassignop(
+                                               tpercenteqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction551
+private class ReduceAction599
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var listnode6 = nodearraylist5
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
-                                               null,
-                                               listnode7
+                                       var tstarstareqnode2 = nodearraylist1
+                                       assert tstarstareqnode2 isa nullable TStarstareq
+                                       var passignopnode1: nullable AStarstarAssignOp = new AStarstarAssignOp.init_astarstarassignop(
+                                               tstarstareqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction552
+private class ReduceAction600
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode8 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var listnode7 = nodearraylist6
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
-                                               null,
-                                               listnode8
+                                       var tpipeeqnode2 = nodearraylist1
+                                       assert tpipeeqnode2 isa nullable TPipeeq
+                                       var passignopnode1: nullable APipeAssignOp = new APipeAssignOp.init_apipeassignop(
+                                               tpipeeqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction553
+private class ReduceAction601
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var ptypenode5 = nodearraylist1
-                                       assert ptypenode5 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               null,
-                                               ptypenode5,
-                                               listnode6
+                                       var tcareteqnode2 = nodearraylist1
+                                       assert tcareteqnode2 isa nullable TCareteq
+                                       var passignopnode1: nullable ACaretAssignOp = new ACaretAssignOp.init_acaretassignop(
+                                               tcareteqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction554
+private class ReduceAction602
        super ReduceAction
        redef fun action(p: Parser)
        do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var ptypenode5 = nodearraylist1
-                                       assert ptypenode5 isa nullable AType
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               null,
-                                               ptypenode5,
-                                               listnode7
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tampeqnode2 = nodearraylist1
+                                       assert tampeqnode2 isa nullable TAmpeq
+                                       var passignopnode1: nullable AAmpAssignOp = new AAmpAssignOp.init_aampassignop(
+                                               tampeqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction555
+private class ReduceAction603
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               null,
-                                               null,
-                                               listnode6
+                                       var tlleqnode2 = nodearraylist1
+                                       assert tlleqnode2 isa nullable TLleq
+                                       var passignopnode1: nullable ALlAssignOp = new ALlAssignOp.init_allassignop(
+                                               tlleqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction556
+private class ReduceAction604
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var listnode6 = nodearraylist2
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               null,
-                                               null,
-                                               listnode7
+                                       var tggeqnode2 = nodearraylist1
+                                       assert tggeqnode2 isa nullable TGgeq
+                                       var passignopnode1: nullable AGgAssignOp = new AGgAssignOp.init_aggassignop(
+                                               tggeqnode2
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = passignopnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction557
+private class ReduceAction605
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -23561,468 +26114,585 @@ private class ReduceAction557
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var plabelnode6 = nodearraylist3
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
                                                null,
-                                               listnode6
+                                               null,
+                                               plabelnode6
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction558
+private class ReduceAction606
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
                                                null,
-                                               listnode7
+                                               null,
+                                               null
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction559
+private class ReduceAction607
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var ptypenode5 = nodearraylist4
-                                       assert ptypenode5 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4,
-                                               ptypenode5,
-                                               listnode6
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwcatchnode4 = nodearraylist4
+                                       assert tkwcatchnode4 isa nullable TKwcatch
+                                       var pexprnode5 = nodearraylist5
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               tkwcatchnode4,
+                                               pexprnode5,
+                                               null
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction560
+private class ReduceAction608
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var ptypenode6 = nodearraylist5
-                                       assert ptypenode6 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5,
-                                               ptypenode6,
-                                               listnode7
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode6 = nodearraylist7
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction561
+private class ReduceAction609
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               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 tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
                                                null,
-                                               listnode6
+                                               null
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction562
+private class ReduceAction610
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode6 = new Array[Object]
-                                       var ptypenode5 = nodearraylist1
-                                       assert ptypenode5 isa nullable AType
-                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
-                                               null,
-                                               listnode3,
-                                               null,
-                                               ptypenode5,
-                                               listnode6
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode6 = nodearraylist8
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist9
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
-                                       node_list = psignaturenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction563
+private class ReduceAction611
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pparamnode1 = nodearraylist1
-                                       if pparamnode1 != null then
-                                               listnode2.add(pparamnode1)
-                                       end
-                                       node_list = listnode2
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var tkwelsenode6 = nodearraylist6
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               null,
+                                               tkwelsenode6,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction564
+private class ReduceAction612
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pparamnode1 = nodearraylist1
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       if pparamnode1 != null then
-                                               listnode3.add(pparamnode1)
-                                       end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var tkwelsenode6 = nodearraylist7
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               null,
+                                               tkwelsenode6,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction565
+private class ReduceAction613
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pparamnode1 = nodearraylist3
-                                       node_list = pparamnode1
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               null,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction566
+private class ReduceAction614
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode7 = nodearraylist6
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
                                                null,
                                                null,
-                                               null
+                                               pexprnode7
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction567
+private class ReduceAction615
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var pannotationsnode5 = nodearraylist2
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
                                                null,
                                                null,
-                                               pannotationsnode5
+                                               pexprnode7
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction568
+private class ReduceAction617
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa nullable AType
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               null,
-                                               null
+                                       var tkwloopnode2 = nodearraylist1
+                                       assert tkwloopnode2 isa nullable TKwloop
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var plabelnode4 = nodearraylist3
+                                       assert plabelnode4 isa nullable ALabel
+                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
+                                               tkwloopnode2,
+                                               pexprnode3,
+                                               plabelnode4
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction569
+private class ReduceAction618
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var pannotationsnode5 = nodearraylist2
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               null,
-                                               pannotationsnode5
+                                       var tkwloopnode2 = nodearraylist1
+                                       assert tkwloopnode2 isa nullable TKwloop
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
+                                               tkwloopnode2,
+                                               pexprnode3,
+                                               null
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction570
+private class ReduceAction619
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa nullable AType
-                                       var tdotdotdotnode4 = nodearraylist3
-                                       assert tdotdotdotnode4 isa nullable TDotdotdot
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               tdotdotdotnode4,
-                                               null
+                                       var tkwwhilenode2 = nodearraylist1
+                                       assert tkwwhilenode2 isa nullable TKwwhile
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwdonode4 = nodearraylist5
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var plabelnode6 = nodearraylist7
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode6
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction571
+private class ReduceAction620
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var tdotdotdotnode4 = nodearraylist4
-                                       assert tdotdotdotnode4 isa nullable TDotdotdot
-                                       var pannotationsnode5 = nodearraylist2
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               tdotdotdotnode4,
-                                               pannotationsnode5
+                                       var tkwwhilenode2 = nodearraylist1
+                                       assert tkwwhilenode2 isa nullable TKwwhile
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwdonode4 = nodearraylist5
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
                                        )
-                                       node_list = pparamnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction572
+private class ReduceAction621
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       listnode2 = concat(listnode2, listnode1)
-                                       node_list = listnode2
+                                       var listnode4 = new Array[Object]
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tkwdonode5 = nodearraylist5
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var pexprnode6 = nodearraylist6
+                                       assert pexprnode6 isa nullable AExpr
+                                       var plabelnode7 = nodearraylist7
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction573
+private class ReduceAction622
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tbangnode3 = nodearraylist1
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist2
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist3
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               null,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
+                                       var listnode4 = new Array[Object]
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tkwdonode5 = nodearraylist5
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var pexprnode6 = nodearraylist6
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
                                                null
                                        )
-                                       node_list = pclosuredeclnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction574
+private class ReduceAction623
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var tbangnode3 = nodearraylist2
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist4
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               tkwbreaknode2,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               null
-                                       )
-                                       node_list = pclosuredeclnode1
+                                       var listnode2 = new Array[Object]
+                                       var pforgroupnode1 = nodearraylist1
+                                       if pforgroupnode1 != null then
+                                               listnode2.add(pforgroupnode1)
+                                       end
+                                       node_list = listnode2
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction575
+private class ReduceAction624
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tbangnode3 = nodearraylist1
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist2
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist3
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               null,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
-                                       )
-                                       node_list = pclosuredeclnode1
+                                       var listnode3 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       var pforgroupnode2 = nodearraylist5
+                                       listnode3 = concat(listnode3, listnode1)
+                                       if pforgroupnode2 != null then
+                                               listnode3.add(pforgroupnode2)
+                                       end
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction576
+private class ReduceAction625
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var tbangnode3 = nodearraylist2
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist4
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               tkwbreaknode2,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       listnode3 = concat(listnode3, listnode2)
+                                       var tkwinnode4 = nodearraylist3
+                                       assert tkwinnode4 isa nullable TKwin
+                                       var pexprnode5 = nodearraylist5
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pforgroupnode1: nullable AForGroup = new AForGroup.init_aforgroup(
+                                               listnode3,
+                                               tkwinnode4,
+                                               pexprnode5
                                        )
-                                       node_list = pclosuredeclnode1
+                                       node_list = pforgroupnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction577
+private class ReduceAction626
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -24034,100 +26704,121 @@ private class ReduceAction577
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tbangnode3 = nodearraylist1
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist2
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist3
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               null,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
+                                       var tkwwithnode2 = nodearraylist1
+                                       assert tkwwithnode2 isa nullable TKwwith
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwdonode4 = nodearraylist5
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var plabelnode6 = nodearraylist7
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable AWithExpr = new AWithExpr.init_awithexpr(
+                                               tkwwithnode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode6
                                        )
-                                       node_list = pclosuredeclnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction578
+private class ReduceAction627
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var tbangnode3 = nodearraylist2
-                                       assert tbangnode3 isa nullable TBang
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa nullable TId
-                                       var psignaturenode5 = nodearraylist4
-                                       assert psignaturenode5 isa nullable ASignature
-                                       var pexprnode6 = nodearraylist7
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredeclnode1: nullable AClosureDecl = new AClosureDecl.init_aclosuredecl(
-                                               tkwbreaknode2,
-                                               tbangnode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
+                                       var tkwwithnode2 = nodearraylist1
+                                       assert tkwwithnode2 isa nullable TKwwith
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwdonode4 = nodearraylist5
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AWithExpr = new AWithExpr.init_awithexpr(
+                                               tkwwithnode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
                                        )
-                                       node_list = pclosuredeclnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction579
+private class ReduceAction628
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode3 = nodearraylist1
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AReturnExpr = new AReturnExpr.init_areturnexpr(
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist2
+                                       assert ptypenode4 isa nullable AType
+                                       var tassignnode5 = nodearraylist3
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist5
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
                                                null,
-                                               pexprnode3
+                                               tidnode3,
+                                               ptypenode4,
+                                               tassignnode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction580
+private class ReduceAction629
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwimportnode2 = nodearraylist1
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var pexterncallnode3 = nodearraylist3
-                                       assert pexterncallnode3 isa nullable AExternCall
-                                       if pexterncallnode3 != null then
-                                               listnode4.add(pexterncallnode3)
-                                       end
-                                       var pexterncallsnode1: nullable AExternCalls = new AExternCalls.init_aexterncalls(
-                                               tkwimportnode2,
-                                               listnode4
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var ptypenode4 = nodearraylist3
+                                       assert ptypenode4 isa nullable AType
+                                       var tassignnode5 = nodearraylist4
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist6
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pannotationsnode7 = nodearraylist2
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
+                                               null,
+                                               tidnode3,
+                                               ptypenode4,
+                                               tassignnode5,
+                                               pexprnode6,
+                                               pannotationsnode7
                                        )
-                                       node_list = pexterncallsnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction581
+private class ReduceAction631
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -24136,668 +26827,789 @@ private class ReduceAction581
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tkwimportnode2 = nodearraylist1
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var pexterncallnode3 = nodearraylist3
-                                       assert pexterncallnode3 isa nullable AExternCall
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       if pexterncallnode3 != null then
-                                               listnode5.add(pexterncallnode3)
-                                       end
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pexterncallsnode1: nullable AExternCalls = new AExternCalls.init_aexterncalls(
-                                               tkwimportnode2,
-                                               listnode5
+                                       var tkwassertnode2 = nodearraylist1
+                                       assert tkwassertnode2 isa nullable TKwassert
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwelsenode5 = nodearraylist3
+                                       assert tkwelsenode5 isa nullable TKwelse
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
+                                               tkwassertnode2,
+                                               null,
+                                               pexprnode4,
+                                               tkwelsenode5,
+                                               pexprnode6
                                        )
-                                       node_list = pexterncallsnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction582
+private class ReduceAction632
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexterncallnode1 = nodearraylist3
-                                       node_list = pexterncallnode1
+                                       var tkwassertnode2 = nodearraylist1
+                                       assert tkwassertnode2 isa nullable TKwassert
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwelsenode5 = nodearraylist4
+                                       assert tkwelsenode5 isa nullable TKwelse
+                                       var pexprnode6 = nodearraylist5
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
+                                               tkwassertnode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwelsenode5,
+                                               pexprnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction583
+private class ReduceAction633
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexterncallnode1 = nodearraylist1
-                                       node_list = pexterncallnode1
+                                       var tkwassertnode2 = nodearraylist1
+                                       assert tkwassertnode2 isa nullable TKwassert
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
+                                               tkwassertnode2,
+                                               null,
+                                               pexprnode4,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction585
+private class ReduceAction634
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwsupernode2 = nodearraylist1
-                                       assert tkwsupernode2 isa nullable TKwsuper
-                                       var pexterncallnode1: nullable ASuperExternCall = new ASuperExternCall.init_asuperexterncall(
-                                               tkwsupernode2
+                                       var tkwassertnode2 = nodearraylist1
+                                       assert tkwassertnode2 isa nullable TKwassert
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
+                                               tkwassertnode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction586
+private class ReduceAction635
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pmethidnode2 = nodearraylist1
-                                       assert pmethidnode2 isa nullable AMethid
-                                       var pexterncallnode1: nullable ALocalPropExternCall = new ALocalPropExternCall.init_alocalpropexterncall(
-                                               pmethidnode2
-                                       )
-                                       node_list = pexterncallnode1
+                                       var tidnode1 = nodearraylist1
+                                       node_list = tidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction587
+private class ReduceAction637
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var tquadnode3 = nodearraylist2
-                                       assert tquadnode3 isa nullable TQuad
-                                       var pmethidnode4 = nodearraylist3
-                                       assert pmethidnode4 isa nullable AMethid
-                                       var pexterncallnode1: nullable AFullPropExternCall = new AFullPropExternCall.init_afullpropexterncall(
-                                               tclassidnode2,
-                                               tquadnode3,
-                                               pmethidnode4
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode6 = nodearraylist9
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfexprExpr = new AIfexprExpr.init_aifexprexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction588
+private class ReduceAction639
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa nullable TClassid
-                                       var pexterncallnode1: nullable AInitPropExternCall = new AInitPropExternCall.init_ainitpropexterncall(
-                                               tclassidnode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwornode3 = nodearraylist2
+                                       assert tkwornode3 isa nullable TKwor
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AOrExpr = new AOrExpr.init_aorexpr(
+                                               pexprnode2,
+                                               tkwornode3,
+                                               pexprnode4
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction589
+private class ReduceAction640
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode2 = nodearraylist1
-                                       assert ptypenode2 isa nullable AType
-                                       var tkwasnode3 = nodearraylist2
-                                       assert tkwasnode3 isa nullable TKwas
-                                       var ptypenode4 = nodearraylist6
-                                       assert ptypenode4 isa nullable AType
-                                       var pexterncallnode1: nullable ACastAsExternCall = new ACastAsExternCall.init_acastasexterncall(
-                                               ptypenode2,
-                                               tkwasnode3,
-                                               ptypenode4
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwandnode3 = nodearraylist2
+                                       assert tkwandnode3 isa nullable TKwand
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAndExpr = new AAndExpr.init_aandexpr(
+                                               pexprnode2,
+                                               tkwandnode3,
+                                               pexprnode4
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction590
+private class ReduceAction641
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode2 = nodearraylist1
-                                       assert ptypenode2 isa nullable AType
-                                       var tkwasnode3 = nodearraylist2
-                                       assert tkwasnode3 isa nullable TKwas
-                                       var tkwnullablenode4 = nodearraylist4
-                                       assert tkwnullablenode4 isa nullable TKwnullable
-                                       var pexterncallnode1: nullable AAsNullableExternCall = new AAsNullableExternCall.init_aasnullableexterncall(
-                                               ptypenode2,
-                                               tkwasnode3,
-                                               tkwnullablenode4
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwornode3 = nodearraylist2
+                                       assert tkwornode3 isa nullable TKwor
+                                       var tkwelsenode4 = nodearraylist3
+                                       assert tkwelsenode4 isa nullable TKwelse
+                                       var pexprnode5 = nodearraylist5
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AOrElseExpr = new AOrElseExpr.init_aorelseexpr(
+                                               pexprnode2,
+                                               tkwornode3,
+                                               tkwelsenode4,
+                                               pexprnode5
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction591
+private class ReduceAction642
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode2 = nodearraylist1
-                                       assert ptypenode2 isa nullable AType
-                                       var tkwasnode3 = nodearraylist2
-                                       assert tkwasnode3 isa nullable TKwas
-                                       var tkwnotnode4 = nodearraylist4
-                                       assert tkwnotnode4 isa nullable TKwnot
-                                       var tkwnullablenode5 = nodearraylist6
-                                       assert tkwnullablenode5 isa nullable TKwnullable
-                                       var pexterncallnode1: nullable AAsNotNullableExternCall = new AAsNotNullableExternCall.init_aasnotnullableexterncall(
-                                               ptypenode2,
-                                               tkwasnode3,
-                                               tkwnotnode4,
-                                               tkwnullablenode5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwimpliesnode3 = nodearraylist2
+                                       assert tkwimpliesnode3 isa nullable TKwimplies
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AImpliesExpr = new AImpliesExpr.init_aimpliesexpr(
+                                               pexprnode2,
+                                               tkwimpliesnode3,
+                                               pexprnode4
                                        )
-                                       node_list = pexterncallnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction592
+private class ReduceAction644
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwinnode2 = nodearraylist1
-                                       assert tkwinnode2 isa nullable TKwin
-                                       var tstringnode3 = nodearraylist2
-                                       assert tstringnode3 isa nullable TString
-                                       var pinlanguagenode1: nullable AInLanguage = new AInLanguage.init_ainlanguage(
-                                               tkwinnode2,
-                                               tstringnode3
+                                       var tkwnotnode2 = nodearraylist1
+                                       assert tkwnotnode2 isa nullable TKwnot
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANotExpr = new ANotExpr.init_anotexpr(
+                                               tkwnotnode2,
+                                               pexprnode3
                                        )
-                                       node_list = pinlanguagenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction593
+private class ReduceAction646
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var texterncodesegmentnode3 = nodearraylist1
-                                       assert texterncodesegmentnode3 isa nullable TExternCodeSegment
-                                       var pexterncodeblocknode1: nullable AExternCodeBlock = new AExternCodeBlock.init_aexterncodeblock(
-                                               null,
-                                               texterncodesegmentnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var teqnode3 = nodearraylist2
+                                       assert teqnode3 isa nullable TEq
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AEqExpr = new AEqExpr.init_aeqexpr(
+                                               pexprnode2,
+                                               teqnode3,
+                                               pexprnode4
                                        )
-                                       node_list = pexterncodeblocknode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction594
+private class ReduceAction647
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pinlanguagenode2 = nodearraylist1
-                                       assert pinlanguagenode2 isa nullable AInLanguage
-                                       var texterncodesegmentnode3 = nodearraylist2
-                                       assert texterncodesegmentnode3 isa nullable TExternCodeSegment
-                                       var pexterncodeblocknode1: nullable AExternCodeBlock = new AExternCodeBlock.init_aexterncodeblock(
-                                               pinlanguagenode2,
-                                               texterncodesegmentnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tnenode3 = nodearraylist2
+                                       assert tnenode3 isa nullable TNe
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
+                                               pexprnode2,
+                                               tnenode3,
+                                               pexprnode4
                                        )
-                                       node_list = pexterncodeblocknode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction595
+private class ReduceAction648
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexterncodeblocknode1 = nodearraylist2
-                                       node_list = pexterncodeblocknode1
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tltnode3 = nodearraylist2
+                                       assert tltnode3 isa nullable TLt
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ALtExpr = new ALtExpr.init_altexpr(
+                                               pexprnode2,
+                                               tltnode3,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction596
+private class ReduceAction649
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tclassidnode3 = nodearraylist1
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               null,
-                                               tclassidnode3,
-                                               listnode4,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tlenode3 = nodearraylist2
+                                       assert tlenode3 isa nullable TLe
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ALeExpr = new ALeExpr.init_aleexpr(
+                                               pexprnode2,
+                                               tlenode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction597
+private class ReduceAction650
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwnullablenode2 = nodearraylist1
-                                       assert tkwnullablenode2 isa nullable TKwnullable
-                                       var tclassidnode3 = nodearraylist2
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               tkwnullablenode2,
-                                               tclassidnode3,
-                                               listnode4,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tgtnode3 = nodearraylist2
+                                       assert tgtnode3 isa nullable TGt
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AGtExpr = new AGtExpr.init_agtexpr(
+                                               pexprnode2,
+                                               tgtnode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction598
+private class ReduceAction651
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tclassidnode3 = nodearraylist1
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var pannotationsnode5 = nodearraylist2
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               null,
-                                               tclassidnode3,
-                                               listnode4,
-                                               pannotationsnode5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tgenode3 = nodearraylist2
+                                       assert tgenode3 isa nullable TGe
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AGeExpr = new AGeExpr.init_ageexpr(
+                                               pexprnode2,
+                                               tgenode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction599
+private class ReduceAction652
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwnullablenode2 = nodearraylist1
-                                       assert tkwnullablenode2 isa nullable TKwnullable
-                                       var tclassidnode3 = nodearraylist2
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var pannotationsnode5 = nodearraylist3
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               tkwnullablenode2,
-                                               tclassidnode3,
-                                               listnode4,
-                                               pannotationsnode5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tstarshipnode3 = nodearraylist2
+                                       assert tstarshipnode3 isa nullable TStarship
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AStarshipExpr = new AStarshipExpr.init_astarshipexpr(
+                                               pexprnode2,
+                                               tstarshipnode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction600
+private class ReduceAction653
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tclassidnode3 = nodearraylist1
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               null,
-                                               tclassidnode3,
-                                               listnode5,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwisanode3 = nodearraylist2
+                                       assert tkwisanode3 isa nullable TKwisa
+                                       var ptypenode4 = nodearraylist4
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AIsaExpr = new AIsaExpr.init_aisaexpr(
+                                               pexprnode2,
+                                               tkwisanode3,
+                                               ptypenode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction601
+private class ReduceAction655
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tkwnullablenode2 = nodearraylist1
-                                       assert tkwnullablenode2 isa nullable TKwnullable
-                                       var tclassidnode3 = nodearraylist2
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               tkwnullablenode2,
-                                               tclassidnode3,
-                                               listnode5,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tpipenode3 = nodearraylist2
+                                       assert tpipenode3 isa nullable TPipe
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable APipeExpr = new APipeExpr.init_apipeexpr(
+                                               pexprnode2,
+                                               tpipenode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction602
+private class ReduceAction657
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tclassidnode3 = nodearraylist1
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode6 = nodearraylist7
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               null,
-                                               tclassidnode3,
-                                               listnode5,
-                                               pannotationsnode6
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tcaretnode3 = nodearraylist2
+                                       assert tcaretnode3 isa nullable TCaret
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ACaretExpr = new ACaretExpr.init_acaretexpr(
+                                               pexprnode2,
+                                               tcaretnode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction603
+private class ReduceAction659
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tkwnullablenode2 = nodearraylist1
-                                       assert tkwnullablenode2 isa nullable TKwnullable
-                                       var tclassidnode3 = nodearraylist2
-                                       assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode6 = nodearraylist8
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var ptypenode1: nullable AType = new AType.init_atype(
-                                               tkwnullablenode2,
-                                               tclassidnode3,
-                                               listnode5,
-                                               pannotationsnode6
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tampnode3 = nodearraylist2
+                                       assert tampnode3 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAmpExpr = new AAmpExpr.init_aampexpr(
+                                               pexprnode2,
+                                               tampnode3,
+                                               pexprnode4
                                        )
-                                       node_list = ptypenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction604
+private class ReduceAction661
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var ptypenode1 = nodearraylist1
-                                       if ptypenode1 != null then
-                                               listnode2.add(ptypenode1)
-                                       end
-                                       node_list = listnode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tllnode3 = nodearraylist2
+                                       assert tllnode3 isa nullable TLl
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ALlExpr = new ALlExpr.init_allexpr(
+                                               pexprnode2,
+                                               tllnode3,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction605
+private class ReduceAction662
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var ptypenode1 = nodearraylist1
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       if ptypenode1 != null then
-                                               listnode3.add(ptypenode1)
-                                       end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tggnode3 = nodearraylist2
+                                       assert tggnode3 isa nullable TGg
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AGgExpr = new AGgExpr.init_aggexpr(
+                                               pexprnode2,
+                                               tggnode3,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction606
+private class ReduceAction664
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode1 = nodearraylist3
-                                       node_list = ptypenode1
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tplusnode3 = nodearraylist2
+                                       assert tplusnode3 isa nullable TPlus
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable APlusExpr = new APlusExpr.init_aplusexpr(
+                                               pexprnode2,
+                                               tplusnode3,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction608
+private class ReduceAction665
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tminusnode3 = nodearraylist2
+                                       assert tminusnode3 isa nullable TMinus
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AMinusExpr = new AMinusExpr.init_aminusexpr(
+                                               pexprnode2,
+                                               tminusnode3,
+                                               pexprnode4
+                                       )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction609
+private class ReduceAction667
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var tkwendnode3 = nodearraylist2
-                                       assert tkwendnode3 isa nullable TKwend
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode2,
-                                               tkwendnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tstarnode3 = nodearraylist2
+                                       assert tstarnode3 isa nullable TStar
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AStarExpr = new AStarExpr.init_astarexpr(
+                                               pexprnode2,
+                                               tstarnode3,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction610
+private class ReduceAction668
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var tkwendnode3 = nodearraylist1
-                                       assert tkwendnode3 isa nullable TKwend
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode2,
-                                               tkwendnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tslashnode3 = nodearraylist2
+                                       assert tslashnode3 isa nullable TSlash
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ASlashExpr = new ASlashExpr.init_aslashexpr(
+                                               pexprnode2,
+                                               tslashnode3,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction611
+private class ReduceAction669
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tpercentnode3 = nodearraylist2
+                                       assert tpercentnode3 isa nullable TPercent
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable APercentExpr = new APercentExpr.init_apercentexpr(
+                                               pexprnode2,
+                                               tpercentnode3,
+                                               pexprnode4
+                                       )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction612
+private class ReduceAction671
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode3,
-                                               null
+                                       var tstarstarnode3 = nodearraylist2
+                                       assert tstarstarnode3 isa nullable TStarstar
+                                       var pexprnode4 = nodearraylist4
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AStarstarExpr = new AStarstarExpr.init_astarstarexpr(
+                                               pexprnode2,
+                                               tstarstarnode3,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction613
+private class ReduceAction673
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       if pexprnode2 != null then
-                                               listnode4.add(pexprnode2)
-                                       end
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode4,
-                                               null
+                                       var nodearraylist1 = p.pop
+                                       var tminusnode2 = nodearraylist1
+                                       assert tminusnode2 isa nullable TMinus
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AUminusExpr = new AUminusExpr.init_auminusexpr(
+                                               tminusnode2,
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction614
+private class ReduceAction674
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode3,
-                                               null
+                                       var tplusnode2 = nodearraylist1
+                                       assert tplusnode2 isa nullable TPlus
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AUplusExpr = new AUplusExpr.init_auplusexpr(
+                                               tplusnode2,
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction615
+private class ReduceAction675
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       if pexprnode2 != null then
-                                               listnode4.add(pexprnode2)
-                                       end
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode4,
-                                               null
+                                       var ttildenode2 = nodearraylist1
+                                       assert ttildenode2 isa nullable TTilde
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AUtildeExpr = new AUtildeExpr.init_autildeexpr(
+                                               ttildenode2,
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction616
+private class ReduceAction676
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -24805,23 +27617,19 @@ private class ReduceAction616
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       var tkwendnode4 = nodearraylist3
-                                       assert tkwendnode4 isa nullable TKwend
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode3,
-                                               tkwendnode4
+                                       var tkwoncenode2 = nodearraylist1
+                                       assert tkwoncenode2 isa nullable TKwonce
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOnceExpr = new AOnceExpr.init_aonceexpr(
+                                               tkwoncenode2,
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction617
+private class ReduceAction678
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -24830,454 +27638,744 @@ private class ReduceAction617
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       if pexprnode2 != null then
-                                               listnode4.add(pexprnode2)
-                                       end
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tkwendnode5 = nodearraylist4
-                                       assert tkwendnode5 isa nullable TKwend
-                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
-                                               listnode4,
-                                               tkwendnode5
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var pexprsnode5 = nodearraylist4
+                                       assert pexprsnode5 isa nullable AExprs
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               null,
+                                               pexprsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction621
+private class ReduceAction679
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreturnnode2 = nodearraylist1
-                                       assert tkwreturnnode2 isa nullable TKwreturn
-                                       var pexprnode1: nullable AReturnExpr = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
-                                               null
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode6 = new Array[Object]
+                                       var pexprsnode5: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               null,
+                                               pexprsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction622
+private class ReduceAction680
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreturnnode2 = nodearraylist1
-                                       assert tkwreturnnode2 isa nullable TKwreturn
+                                       var tkwissetnode2 = nodearraylist1
+                                       assert tkwissetnode2 isa nullable TKwisset
                                        var pexprnode3 = nodearraylist2
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AReturnExpr = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
-                                               pexprnode3
+                                       var tattridnode4 = nodearraylist6
+                                       assert tattridnode4 isa nullable TAttrid
+                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
+                                               tkwissetnode2,
+                                               pexprnode3,
+                                               tattridnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction623
+private class ReduceAction681
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               null,
-                                               null
+                                       var tkwissetnode2 = nodearraylist1
+                                       assert tkwissetnode2 isa nullable TKwisset
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var tattridnode6 = nodearraylist7
+                                       assert tattridnode6 isa nullable TAttrid
+                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
+                                               tkwissetnode2,
+                                               pexprnode3,
+                                               tattridnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction624
+private class ReduceAction682
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               plabelnode3,
-                                               null
+                                       var tkwissetnode2 = nodearraylist1
+                                       assert tkwissetnode2 isa nullable TKwisset
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tattridnode4 = nodearraylist3
+                                       assert tattridnode4 isa nullable TAttrid
+                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
+                                               tkwissetnode2,
+                                               pexprnode3,
+                                               tattridnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction625
+private class ReduceAction683
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tidnode6 = nodearraylist5
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               pexprnode4
+                                               tidnode6
+                                       )
+                                       var pexprsnode7 = nodearraylist6
+                                       assert pexprsnode7 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction626
+private class ReduceAction684
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               plabelnode3,
-                                               pexprnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tidnode6 = nodearraylist5
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode6
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction627
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwabortnode2 = nodearraylist1
-                                       assert tkwabortnode2 isa nullable TKwabort
-                                       var pexprnode1: nullable AAbortExpr = new AAbortExpr.init_aabortexpr(
-                                               tkwabortnode2
+                                       var listnode8 = new Array[Object]
+                                       var pexprsnode7: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction628
+private class ReduceAction685
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null,
-                                               null
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist7
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction629
+private class ReduceAction686
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               plabelnode3,
-                                               null
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction630
+private class ReduceAction687
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null,
-                                               pexprnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist5
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist6
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist7
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist8
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction631
+private class ReduceAction688
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               plabelnode3,
-                                               pexprnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist5
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist6
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist7
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction638
+private class ReduceAction689
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist5
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist5
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist7
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction639
+private class ReduceAction690
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist5
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction640
+private class ReduceAction691
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist5
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist6
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist7
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction641
+private class ReduceAction692
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist6
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist7
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction643
+private class ReduceAction693
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode10
+                                       )
+                                       var pexprsnode11 = nodearraylist8
+                                       assert pexprsnode11 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode11
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction644
+private class ReduceAction694
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist4
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode11
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction646
+private class ReduceAction695
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist5
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist6
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tclassidnode10 = nodearraylist7
+                                       assert tclassidnode10 isa nullable TClassid
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode9,
+                                               tclassidnode10
+                                       )
+                                       var tidnode11 = nodearraylist8
+                                       assert tidnode11 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode11
+                                       )
+                                       var pexprsnode12 = nodearraylist9
+                                       assert pexprsnode12 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode12
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction647
+private class ReduceAction696
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       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 tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tclassidnode10 = nodearraylist7
+                                       assert tclassidnode10 isa nullable TClassid
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode9,
+                                               tclassidnode10
+                                       )
+                                       var tidnode11 = nodearraylist8
+                                       assert tidnode11 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode11
+                                       )
+                                       var listnode13 = new Array[Object]
+                                       var pexprsnode12: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode13
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode12
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction648
+private class ReduceAction697
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -25285,32 +28383,47 @@ private class ReduceAction648
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist5
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist6
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist7
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode9,
+                                               null
+                                       )
+                                       var tidnode11 = nodearraylist7
+                                       assert tidnode11 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode11
+                                       )
+                                       var pexprsnode12 = nodearraylist8
+                                       assert pexprsnode12 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode12
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction649
+private class ReduceAction698
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -25318,104 +28431,141 @@ private class ReduceAction649
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist6
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist7
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist8
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tquestnode5 = nodearraylist3
+                                       assert tquestnode5 isa nullable TQuest
+                                       var pexprnode3: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode4,
+                                               tquestnode5
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pqualifiednode7: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode9,
+                                               null
+                                       )
+                                       var tidnode11 = nodearraylist7
+                                       assert tidnode11 isa nullable TId
+                                       var pqidnode6: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode7,
+                                               tidnode11
+                                       )
+                                       var listnode13 = new Array[Object]
+                                       var pexprsnode12: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode13
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode6,
+                                               pexprsnode12
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction651
+private class ReduceAction699
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist4
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode6 = nodearraylist2
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode6
+                                       )
+                                       var pexprsnode7 = nodearraylist3
+                                       assert pexprsnode7 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction652
+private class ReduceAction700
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist4
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var listnode5 = nodearraylist5
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode6
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode6 = nodearraylist2
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode6
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var pexprsnode7: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction654
+private class ReduceAction701
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa nullable TKwsuper
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
-                                               null,
-                                               tkwsupernode3,
-                                               pexprsnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist4
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction655
+private class ReduceAction702
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -25423,139 +28573,201 @@ private class ReduceAction655
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tclassidnode4 = nodearraylist1
-                                       assert tclassidnode4 isa nullable TClassid
-                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
-                                               listnode3,
-                                               tclassidnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       var tkwsupernode5 = nodearraylist2
-                                       assert tkwsupernode5 isa nullable TKwsuper
-                                       var pexprsnode6 = nodearraylist3
-                                       assert pexprsnode6 isa nullable AExprs
-                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode5,
-                                               pexprsnode6
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction656
+private class ReduceAction703
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tclassidnode5 = nodearraylist2
-                                       assert tclassidnode5 isa nullable TClassid
-                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
-                                               listnode4,
-                                               tclassidnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist2
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist3
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
                                        )
-                                       var tkwsupernode6 = nodearraylist3
-                                       assert tkwsupernode6 isa nullable TKwsuper
-                                       var pexprsnode7 = nodearraylist4
-                                       assert pexprsnode7 isa nullable AExprs
-                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode6,
-                                               pexprsnode7
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist5
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction657
+private class ReduceAction704
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
-                                               listnode4,
-                                               null
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist2
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist3
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
                                        )
-                                       var tkwsupernode6 = nodearraylist2
-                                       assert tkwsupernode6 isa nullable TKwsuper
-                                       var pexprsnode7 = nodearraylist3
-                                       assert pexprsnode7 isa nullable AExprs
-                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode6,
-                                               pexprsnode7
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction658
+private class ReduceAction705
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist5
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist2
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
+                                       )
+                                       var tidnode9 = nodearraylist3
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist4
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction659
+private class ReduceAction706
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist2
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
+                                       )
+                                       var tidnode9 = nodearraylist3
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction660
+private class ReduceAction708
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -25563,69 +28775,64 @@ private class ReduceAction660
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tkwinitnode3 = nodearraylist5
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist6
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                       var tattridnode3 = nodearraylist5
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                               tattridnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction661
+private class ReduceAction709
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tkwinitnode3 = nodearraylist6
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist7
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tattridnode5 = nodearraylist6
+                                       assert tattridnode5 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                               tattridnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction663
+private class ReduceAction710
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tkwinitnode3 = nodearraylist2
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                       var tattridnode3 = nodearraylist2
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                               tattridnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction664
+private class ReduceAction712
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -25634,21 +28841,28 @@ private class ReduceAction664
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tkwinitnode3 = nodearraylist3
-                                       assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist4
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
+                                       )
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               pexprsnode4
+                                               pqidnode3,
+                                               pexprsnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction666
+private class ReduceAction714
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -25658,78 +28872,116 @@ private class ReduceAction666
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwdebugnode2 = nodearraylist1
-                                       assert tkwdebugnode2 isa nullable TKwdebug
-                                       var tkwtypenode3 = nodearraylist2
-                                       assert tkwtypenode3 isa nullable TKwtype
-                                       var pexprnode4 = nodearraylist5
-                                       assert pexprnode4 isa nullable AExpr
-                                       var ptypenode5 = nodearraylist3
-                                       assert ptypenode5 isa nullable AType
-                                       var pexprnode1: nullable ADebugTypeExpr = new ADebugTypeExpr.init_adebugtypeexpr(
-                                               tkwdebugnode2,
-                                               tkwtypenode3,
-                                               pexprnode4,
-                                               ptypenode5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist4
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction667
+private class ReduceAction716
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwlabelnode2 = nodearraylist1
-                                       assert tkwlabelnode2 isa nullable TKwlabel
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var plabelnode1: nullable ALabel = new ALabel.init_alabel(
-                                               tkwlabelnode2,
-                                               tidnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist5
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
                                        )
-                                       node_list = plabelnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction668
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pclosuredefnode1 = nodearraylist1
-                                       if pclosuredefnode1 != null then
-                                               listnode2.add(pclosuredefnode1)
-                                       end
-                                       node_list = listnode2
+                                       var tidnode8 = nodearraylist6
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction669
+private class ReduceAction718
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pclosuredefnode1 = nodearraylist1
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       if pclosuredefnode1 != null then
-                                               listnode3.add(pclosuredefnode1)
-                                       end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
+                                       )
+                                       var tidnode8 = nodearraylist5
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction670
+private class ReduceAction720
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -25739,448 +28991,435 @@ private class ReduceAction670
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa nullable TKwdo
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
-                                       var plabelnode7 = nodearraylist5
-                                       assert plabelnode7 isa nullable ALabel
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6,
-                                               plabelnode7
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tidnode7 = nodearraylist5
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
                                        )
-                                       node_list = pclosuredefnode1
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction671
+private class ReduceAction722
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist8
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist9
-                                       assert pexprnode7 isa nullable AExpr
-                                       var plabelnode8 = nodearraylist10
-                                       assert plabelnode8 isa nullable ALabel
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               plabelnode8
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var listnode7 = new Array[Object]
+                                       var tclassidnode8 = nodearraylist5
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist6
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode10
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction672
+private class ReduceAction724
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist4
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist5
-                                       assert pexprnode7 isa nullable AExpr
-                                       var plabelnode8 = nodearraylist6
-                                       assert plabelnode8 isa nullable ALabel
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               plabelnode8
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tclassidnode9 = nodearraylist6
+                                       assert tclassidnode9 isa nullable TClassid
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
+                                               tclassidnode9
+                                       )
+                                       var tidnode10 = nodearraylist7
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction673
+private class ReduceAction726
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa nullable TKwdo
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6,
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pqualifiednode6: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode8,
                                                null
                                        )
-                                       node_list = pclosuredefnode1
+                                       var tidnode10 = nodearraylist6
+                                       assert tidnode10 isa nullable TId
+                                       var pqidnode5: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode6,
+                                               tidnode10
+                                       )
+                                       var listnode12 = new Array[Object]
+                                       var pexprsnode11: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode12
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode5,
+                                               pexprsnode11
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction674
+private class ReduceAction728
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist8
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist9
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tidnode5 = nodearraylist1
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
+                                       )
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction675
+private class ReduceAction730
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
                                        var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist4
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist5
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
+                                       var tclassidnode6 = nodearraylist1
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
                                                listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist2
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
                                        )
-                                       node_list = pclosuredefnode1
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction676
+private class ReduceAction732
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode4,
-                                               null,
-                                               pexprnode6,
-                                               null
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist2
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction677
+private class ReduceAction734
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               null,
-                                               pexprnode7,
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist1
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
                                                null
                                        )
-                                       node_list = pclosuredefnode1
+                                       var tidnode8 = nodearraylist2
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction678
+private class ReduceAction736
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
                                        var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pexprnode7 = nodearraylist6
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               null,
-                                               pexprnode7,
-                                               null
+                                       var pexprsnode4: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode5
+                                       )
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               pexprsnode4
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction679
+private class ReduceAction738
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa nullable TKwdo
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode5 = new Array[Object]
+                                       var pexprsnode4: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode5
                                        )
-                                       node_list = pclosuredefnode1
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction680
+private class ReduceAction740
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist8
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
+                                       )
+                                       var tkwinitnode5 = nodearraylist5
+                                       assert tkwinitnode5 isa nullable TKwinit
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode5,
+                                               pexprsnode6
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction681
+private class ReduceAction742
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
                                        var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist4
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist6
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                       var pexprsnode4: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode5
                                        )
-                                       node_list = pclosuredefnode1
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               pexprsnode4
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction682
+private class ReduceAction743
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa nullable TKwdo
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode4,
-                                               tkwdonode5,
-                                               null,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
+                                               pexprnode2,
+                                               pexprsnode3
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction683
+private class ReduceAction744
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -26188,579 +29427,637 @@ private class ReduceAction683
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist8
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var tidnode6 = nodearraylist6
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               null
+                                               tidnode6
+                                       )
+                                       var pexprsnode7 = nodearraylist7
+                                       assert pexprsnode7 isa nullable AExprs
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction684
+private class ReduceAction745
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tbangnode2 = nodearraylist1
-                                       assert tbangnode2 isa nullable TBang
-                                       var pclosureidnode3 = nodearraylist2
-                                       assert pclosureidnode3 isa nullable AClosureId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tkwdonode6 = nodearraylist4
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
-                                               tbangnode2,
-                                               pclosureidnode3,
-                                               listnode5,
-                                               tkwdonode6,
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var tidnode6 = nodearraylist6
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               null
+                                               tidnode6
+                                       )
+                                       var listnode8 = new Array[Object]
+                                       var pexprsnode7: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode7
                                        )
-                                       node_list = pclosuredefnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction685
+private class ReduceAction746
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var pclosureidnode1: nullable ASimpleClosureId = new ASimpleClosureId.init_asimpleclosureid(
-                                               tidnode2
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist6
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist7
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist8
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
-                                       node_list = pclosureidnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction686
+private class ReduceAction747
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var pclosureidnode1: nullable ABreakClosureId = new ABreakClosureId.init_abreakclosureid(
-                                               tkwbreaknode2
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist6
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist7
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
-                                       node_list = pclosureidnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction687
+private class ReduceAction748
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode4 = nodearraylist1
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               null,
-                                               null,
-                                               pexprnode4
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist7
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist8
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist9
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction688
+private class ReduceAction749
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               null,
-                                               null,
-                                               null
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist7
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist8
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction689
+private class ReduceAction750
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pannotationsnode7 = nodearraylist3
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               null,
-                                               null,
-                                               pannotationsnode7
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
+                                       )
+                                       var tidnode9 = nodearraylist7
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist8
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode10
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction690
+private class ReduceAction751
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa nullable AType
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               null,
-                                               null,
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
                                                null
                                        )
+                                       var tidnode9 = nodearraylist7
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               pqidnode4,
+                                               pexprsnode10
+                                       )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction691
+private class ReduceAction752
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var ptypenode4 = nodearraylist4
-                                       assert ptypenode4 isa nullable AType
-                                       var pannotationsnode7 = nodearraylist3
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               null,
-                                               null,
-                                               pannotationsnode7
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var toparnode4 = nodearraylist6
+                                       assert toparnode4 isa nullable TOpar
+                                       var ptypenode5 = nodearraylist8
+                                       assert ptypenode5 isa nullable AType
+                                       var tcparnode6 = nodearraylist10
+                                       assert tcparnode6 isa nullable TCpar
+                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               toparnode4,
+                                               ptypenode5,
+                                               tcparnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction692
+private class ReduceAction753
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               tassignnode5,
-                                               pexprnode6,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var toparnode4 = nodearraylist6
+                                       assert toparnode4 isa nullable TOpar
+                                       var tkwnotnode5 = nodearraylist8
+                                       assert tkwnotnode5 isa nullable TKwnot
+                                       var tkwnullnode6 = nodearraylist10
+                                       assert tkwnullnode6 isa nullable TKwnull
+                                       var tcparnode7 = nodearraylist12
+                                       assert tcparnode7 isa nullable TCpar
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               toparnode4,
+                                               tkwnotnode5,
+                                               tkwnullnode6,
+                                               tcparnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction693
+private class ReduceAction754
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var tassignnode5 = nodearraylist4
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pannotationsnode7 = nodearraylist3
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode5 = nodearraylist6
+                                       assert tkwnotnode5 isa nullable TKwnot
+                                       var tkwnullnode6 = nodearraylist8
+                                       assert tkwnullnode6 isa nullable TKwnull
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
                                                null,
-                                               tassignnode5,
-                                               pexprnode6,
-                                               pannotationsnode7
+                                               tkwnotnode5,
+                                               tkwnullnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction694
+private class ReduceAction756
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa nullable AType
-                                       var tassignnode5 = nodearraylist4
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               tassignnode5,
-                                               pexprnode6,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tdotdotdotnode3 = nodearraylist2
+                                       assert tdotdotdotnode3 isa nullable TDotdotdot
+                                       var pexprnode1: nullable AVarargExpr = new AVarargExpr.init_avarargexpr(
+                                               pexprnode2,
+                                               tdotdotdotnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction695
+private class ReduceAction757
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa nullable TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var ptypenode4 = nodearraylist4
-                                       assert ptypenode4 isa nullable AType
-                                       var tassignnode5 = nodearraylist5
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist7
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pannotationsnode7 = nodearraylist3
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pexprnode1: nullable AVardeclExpr = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               tassignnode5,
-                                               pexprnode6,
-                                               pannotationsnode7
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var tassignnode3 = nodearraylist2
+                                       assert tassignnode3 isa nullable TAssign
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ANamedargExpr = new ANamedargExpr.init_anamedargexpr(
+                                               tidnode2,
+                                               tassignnode3,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction696
+private class ReduceAction758
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist5
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tkwselfnode2 = nodearraylist1
+                                       assert tkwselfnode2 isa nullable TKwself
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
+                                               tkwselfnode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction697
+private class ReduceAction759
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist2
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tkwtruenode2 = nodearraylist1
+                                       assert tkwtruenode2 isa nullable TKwtrue
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
+                                               tkwtruenode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction698
+private class ReduceAction760
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist5
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist6
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tkwfalsenode2 = nodearraylist1
+                                       assert tkwfalsenode2 isa nullable TKwfalse
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
+                                               tkwfalsenode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction699
+private class ReduceAction761
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist6
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist7
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tkwnullnode2 = nodearraylist1
+                                       assert tkwnullnode2 isa nullable TKwnull
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
+                                               tkwnullnode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction701
+private class ReduceAction762
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist2
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist3
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist4
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tintegernode2 = nodearraylist1
+                                       assert tintegernode2 isa nullable TInteger
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable AIntegerExpr = new AIntegerExpr.init_aintegerexpr(
+                                               tintegernode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction702
+private class ReduceAction763
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist3
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var tassignnode4 = nodearraylist4
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist5
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrAssignExpr = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tfloatnode2 = nodearraylist1
+                                       assert tfloatnode2 isa nullable TFloat
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
+                                               tfloatnode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction704
+private class ReduceAction764
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist5
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist6
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist7
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       var tcharnode2 = nodearraylist1
+                                       assert tcharnode2 isa nullable TChar
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
+                                               tcharnode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction705
+private class ReduceAction765
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       var tstringnode2 = nodearraylist1
+                                       assert tstringnode2 isa nullable TString
+                                       var pannotationsnode3 = nodearraylist2
+                                       assert pannotationsnode3 isa nullable AAnnotations
+                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
+                                               tstringnode2,
+                                               pannotationsnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction706
+private class ReduceAction767
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -26768,33 +30065,37 @@ private class ReduceAction706
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist5
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist6
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist7
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist8
+                                       var tkwmethnode2 = nodearraylist1
+                                       assert tkwmethnode2 isa nullable TKwmeth
+                                       var psignaturenode3 = nodearraylist2
+                                       assert psignaturenode3 isa nullable ASignature
+                                       var tkwdonode4 = nodearraylist3
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6 = nodearraylist5
                                        assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       if pexprnode6 != null then
+                                               listnode7.add(pexprnode6)
+                                       end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7,
+                                               null
+                                       )
+                                       var pexprnode1: nullable ALambdaExpr = new ALambdaExpr.init_alambdaexpr(
+                                               tkwmethnode2,
+                                               psignaturenode3,
+                                               tkwdonode4,
+                                               pexprnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction707
+private class ReduceAction768
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -26803,28 +30104,36 @@ private class ReduceAction707
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist6
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist7
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist8
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist9
+                                       var tkwmethnode2 = nodearraylist1
+                                       assert tkwmethnode2 isa nullable TKwmeth
+                                       var psignaturenode3 = nodearraylist2
+                                       assert psignaturenode3 isa nullable ASignature
+                                       var tkwdonode4 = nodearraylist3
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode6 = nodearraylist5
                                        assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       var listnode7 = nodearraylist6
+                                       assert listnode7 isa Array[Object]
+                                       if pexprnode6 != null then
+                                               listnode8.add(pexprnode6)
+                                       end
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8,
+                                               null
+                                       )
+                                       var pexprnode1: nullable ALambdaExpr = new ALambdaExpr.init_alambdaexpr(
+                                               tkwmethnode2,
+                                               psignaturenode3,
+                                               tkwdonode4,
+                                               pexprnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction709
+private class ReduceAction769
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -26834,85 +30143,103 @@ private class ReduceAction709
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist4
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       var tkwmethnode2 = nodearraylist1
+                                       assert tkwmethnode2 isa nullable TKwmeth
+                                       var psignaturenode3 = nodearraylist2
+                                       assert psignaturenode3 isa nullable ASignature
+                                       var tkwdonode4 = nodearraylist3
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist5
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable ALambdaExpr = new ALambdaExpr.init_alambdaexpr(
+                                               tkwmethnode2,
+                                               psignaturenode3,
+                                               tkwdonode4,
+                                               pexprnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction710
+private class ReduceAction771
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist4
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var tassignnode5 = nodearraylist5
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tdotdotnode4 = nodearraylist5
+                                       assert tdotdotnode4 isa nullable TDotdot
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tcbranode6 = nodearraylist9
+                                       assert tcbranode6 isa nullable TCbra
+                                       var pannotationsnode7 = nodearraylist10
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable ACrangeExpr = new ACrangeExpr.init_acrangeexpr(
+                                               tobranode2,
+                                               pexprnode3,
+                                               tdotdotnode4,
+                                               pexprnode5,
+                                               tcbranode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction712
+private class ReduceAction772
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprsnode3 = nodearraylist2
-                                       assert pexprsnode3 isa nullable AExprs
-                                       var tassignnode4 = nodearraylist3
-                                       assert tassignnode4 isa nullable TAssign
-                                       var pexprnode5 = nodearraylist4
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tdotdotnode4 = nodearraylist5
+                                       assert tdotdotnode4 isa nullable TDotdot
+                                       var pexprnode5 = nodearraylist7
                                        assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable ABraAssignExpr = new ABraAssignExpr.init_abraassignexpr(
-                                               pexprnode2,
-                                               pexprsnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var tobranode6 = nodearraylist9
+                                       assert tobranode6 isa nullable TObra
+                                       var pannotationsnode7 = nodearraylist10
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable AOrangeExpr = new AOrangeExpr.init_aorangeexpr(
+                                               tobranode2,
+                                               pexprnode3,
+                                               tdotdotnode4,
+                                               pexprnode5,
+                                               tobranode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction713
+private class ReduceAction773
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -26923,164 +30250,141 @@ private class ReduceAction713
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist5
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var listnode4 = new Array[Object]
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var ptypenode5 = nodearraylist4
+                                       assert ptypenode5 isa nullable AType
+                                       var tcbranode6 = nodearraylist5
+                                       assert tcbranode6 isa nullable TCbra
+                                       var pannotationsnode7 = nodearraylist6
+                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var pexprnode1: nullable AArrayExpr = new AArrayExpr.init_aarrayexpr(
+                                               tobranode2,
+                                               listnode4,
+                                               ptypenode5,
+                                               tcbranode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction714
+private class ReduceAction774
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist2
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tcparnode4 = nodearraylist5
+                                       assert tcparnode4 isa nullable TCpar
+                                       var pannotationsnode5 = nodearraylist6
+                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pexprnode1: nullable AParExpr = new AParExpr.init_aparexpr(
+                                               toparnode2,
+                                               pexprnode3,
+                                               tcparnode4,
+                                               pannotationsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction715
+private class ReduceAction776
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist5
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist6
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+                                       if pexprnode2 != null then
+                                               listnode4.add(pexprnode2)
+                                       end
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var pexprnode1: nullable AManyExpr = new AManyExpr.init_amanyexpr(
+                                               listnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction716
+private class ReduceAction777
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist6
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist7
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
-                                       )
+                                       var pexprnode1 = nodearraylist3
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction718
+private class ReduceAction778
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction779
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist2
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist3
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist4
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
-                                       )
-                                       node_list = pexprnode1
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction719
+private class ReduceAction781
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist3
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var passignopnode4 = nodearraylist4
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist5
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAttrReassignExpr = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
-                                       )
+                                       var pexprnode1 = nodearraylist1
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction721
+private class ReduceAction783
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -27092,431 +30396,400 @@ private class ReduceAction721
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist5
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist6
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist7
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               null,
+                                               null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction722
+private class ReduceAction784
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist2
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist3
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                       var listnode4 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       listnode4 = concat(listnode4, listnode2)
+                                       if pexprnode3 != null then
+                                               listnode4.add(pexprnode3)
+                                       end
+                                       var pannotationsnode5 = nodearraylist3
+                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
+                                               listnode4,
+                                               pannotationsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction723
+private class ReduceAction785
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist5
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist6
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist7
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist8
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                       var listnode5 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       listnode5 = concat(listnode5, listnode2)
+                                       listnode5 = concat(listnode5, listnode3)
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
+                                       end
+                                       var pannotationsnode6 = nodearraylist4
+                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
+                                               listnode5,
+                                               pannotationsnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction724
+private class ReduceAction786
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist6
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist7
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist8
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist9
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
-                                       )
-                                       node_list = pexprnode1
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       var pexprnode2 = nodearraylist3
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction726
+private class ReduceAction787
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist4
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
-                                       )
-                                       node_list = pexprnode1
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction727
+private class ReduceAction788
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist4
-                                       assert pexprsnode4 isa nullable AExprs
-                                       var passignopnode5 = nodearraylist5
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa nullable AExpr
-                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                       var tstartstringnode2 = nodearraylist1
+                                       assert tstartstringnode2 isa nullable TStartString
+                                       var pexprnode1: nullable AStartStringExpr = new AStartStringExpr.init_astartstringexpr(
+                                               tstartstringnode2
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction729
+private class ReduceAction791
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprsnode3 = nodearraylist2
-                                       assert pexprsnode3 isa nullable AExprs
-                                       var passignopnode4 = nodearraylist3
-                                       assert passignopnode4 isa nullable AAssignOp
-                                       var pexprnode5 = nodearraylist4
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable ABraReassignExpr = new ABraReassignExpr.init_abrareassignexpr(
-                                               pexprnode2,
-                                               pexprsnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var tmidstringnode2 = nodearraylist1
+                                       assert tmidstringnode2 isa nullable TMidString
+                                       var pexprnode1: nullable AMidStringExpr = new AMidStringExpr.init_amidstringexpr(
+                                               tmidstringnode2
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction730
+private class ReduceAction792
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tpluseqnode2 = nodearraylist1
-                                       assert tpluseqnode2 isa nullable TPluseq
-                                       var passignopnode1: nullable APlusAssignOp = new APlusAssignOp.init_aplusassignop(
-                                               tpluseqnode2
+                                       var tendstringnode2 = nodearraylist1
+                                       assert tendstringnode2 isa nullable TEndString
+                                       var pexprnode1: nullable AEndStringExpr = new AEndStringExpr.init_aendstringexpr(
+                                               tendstringnode2
                                        )
-                                       node_list = passignopnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction731
+private class ReduceAction793
        super ReduceAction
        redef fun action(p: Parser)
        do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tminuseqnode2 = nodearraylist1
-                                       assert tminuseqnode2 isa nullable TMinuseq
-                                       var passignopnode1: nullable AMinusAssignOp = new AMinusAssignOp.init_aminusassignop(
-                                               tminuseqnode2
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tatnode3 = nodearraylist1
+                                       assert tatnode3 isa nullable TAt
+                                       var pannotationnode5 = nodearraylist2
+                                       assert pannotationnode5 isa nullable AAnnotation
+                                       if pannotationnode5 != null then
+                                               listnode6.add(pannotationnode5)
+                                       end
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               null,
+                                               tatnode3,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               null
                                        )
-                                       node_list = passignopnode1
+                                       node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction732
+private class ReduceAction794
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwdonode2 = nodearraylist1
-                                       assert tkwdonode2 isa nullable TKwdo
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var plabelnode4 = nodearraylist3
-                                       assert plabelnode4 isa nullable ALabel
-                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
-                                               tkwdonode2,
-                                               pexprnode3,
-                                               plabelnode4
+                                       var listnode6 = new Array[Object]
+                                       var tatnode3 = nodearraylist1
+                                       assert tatnode3 isa nullable TAt
+                                       var toparnode4 = nodearraylist2
+                                       assert toparnode4 isa nullable TOpar
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcparnode7 = nodearraylist6
+                                       assert tcparnode7 isa nullable TCpar
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               null,
+                                               tatnode3,
+                                               toparnode4,
+                                               listnode6,
+                                               tcparnode7,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction733
+private class ReduceAction795
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwdonode2 = nodearraylist1
-                                       assert tkwdonode2 isa nullable TKwdo
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
-                                               tkwdonode2,
-                                               pexprnode3,
-                                               null
-                                       )
-                                       node_list = pexprnode1
+                                       var pannotationsnode1 = nodearraylist1
+                                       node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction734
+private class ReduceAction797
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                       var listnode8 = new Array[Object]
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist1
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist2
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction735
+private class ReduceAction798
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               null
+                                       var listnode8 = new Array[Object]
+                                       var tkwpublicnode5 = nodearraylist1
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist4
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction736
+private class ReduceAction799
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                       var listnode8 = new Array[Object]
+                                       var tkwprivatenode5 = nodearraylist1
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist4
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction737
+private class ReduceAction800
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
+                                       var listnode8 = new Array[Object]
+                                       var tkwprotectednode5 = nodearraylist1
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist4
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
                                                null,
-                                               pexprnode5
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction738
+private class ReduceAction801
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
+                                       var listnode8 = new Array[Object]
+                                       var tkwintrudenode5 = nodearraylist1
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist4
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
                                                null,
-                                               pexprnode5
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction741
+private class ReduceAction802
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -27524,159 +30797,179 @@ private class ReduceAction741
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwloopnode2 = nodearraylist1
-                                       assert tkwloopnode2 isa nullable TKwloop
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var plabelnode4 = nodearraylist3
-                                       assert plabelnode4 isa nullable ALabel
-                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
-                                               tkwloopnode2,
-                                               pexprnode3,
-                                               plabelnode4
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist3
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction742
+private class ReduceAction803
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwloopnode2 = nodearraylist1
-                                       assert tkwloopnode2 isa nullable TKwloop
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
-                                               tkwloopnode2,
-                                               pexprnode3,
-                                               null
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction743
+private class ReduceAction804
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwhilenode2 = nodearraylist1
-                                       assert tkwwhilenode2 isa nullable TKwwhile
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tkwdonode4 = nodearraylist5
-                                       assert tkwdonode4 isa nullable TKwdo
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var plabelnode6 = nodearraylist7
-                                       assert plabelnode6 isa nullable ALabel
-                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
-                                               tkwwhilenode2,
-                                               pexprnode3,
-                                               tkwdonode4,
-                                               pexprnode5,
-                                               plabelnode6
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction744
+private class ReduceAction805
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwhilenode2 = nodearraylist1
-                                       assert tkwwhilenode2 isa nullable TKwwhile
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tkwdonode4 = nodearraylist5
-                                       assert tkwdonode4 isa nullable TKwdo
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
-                                               tkwwhilenode2,
-                                               pexprnode3,
-                                               tkwdonode4,
-                                               pexprnode5,
-                                               null
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction745
+private class ReduceAction806
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist15 = p.pop
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa nullable TKwfor
-                                       var listnode3 = nodearraylist5
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist11
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist13
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist14
-                                       assert pexprnode7 isa nullable AExpr
-                                       var plabelnode8 = nodearraylist15
-                                       assert plabelnode8 isa nullable ALabel
-                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
-                                               tkwfornode2,
-                                               listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               plabelnode8
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction746
+private class ReduceAction807
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -27684,42 +30977,40 @@ private class ReduceAction746
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa nullable TKwfor
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist9
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
-                                       var plabelnode8 = nodearraylist11
-                                       assert plabelnode8 isa nullable ALabel
-                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
-                                               tkwfornode2,
-                                               listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               plabelnode8
+                                       var listnode9 = new Array[Object]
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist1
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist2
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist4
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist6
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction747
+private class ReduceAction808
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist14 = p.pop
-                                       var nodearraylist13 = p.pop
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -27729,36 +31020,42 @@ private class ReduceAction747
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa nullable TKwfor
-                                       var listnode3 = nodearraylist5
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist11
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist13
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist14
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
-                                               tkwfornode2,
-                                               listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var tkwpublicnode5 = nodearraylist1
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction748
+private class ReduceAction809
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -27768,171 +31065,320 @@ private class ReduceAction748
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa nullable TKwfor
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist9
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
-                                               tkwfornode2,
-                                               listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var tkwprivatenode5 = nodearraylist1
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction749
+private class ReduceAction810
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa nullable TKwassert
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist4
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
+                                       var listnode9 = new Array[Object]
+                                       var tkwprotectednode5 = nodearraylist1
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
                                                null,
-                                               pexprnode4,
-                                               pexprnode5
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction750
+private class ReduceAction811
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa nullable TKwassert
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist5
-                                       assert pexprnode5 isa nullable AExpr
-                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
-                                               tidnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                       var listnode9 = new Array[Object]
+                                       var tkwintrudenode5 = nodearraylist1
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction751
+private class ReduceAction812
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa nullable TKwassert
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
-                                               null,
-                                               pexprnode4,
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist3
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist7
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction752
+private class ReduceAction813
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa nullable TKwassert
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
-                                               tidnode3,
-                                               pexprnode4,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction753
+private class ReduceAction814
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode1 = nodearraylist1
-                                       node_list = tidnode1
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction763
+private class ReduceAction815
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprsnode3 = nodearraylist2
-                                       assert pexprsnode3 isa nullable AExprs
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
-                                               pexprnode2,
-                                               pexprsnode3,
-                                               listnode5
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction765
+private class ReduceAction816
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -27943,115 +31389,178 @@ private class ReduceAction765
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa nullable TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tkwthennode4 = nodearraylist5
-                                       assert tkwthennode4 isa nullable TKwthen
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwelsenode6 = nodearraylist9
-                                       assert tkwelsenode6 isa nullable TKwelse
-                                       var pexprnode7 = nodearraylist11
-                                       assert pexprnode7 isa nullable AExpr
-                                       var pexprnode1: nullable AIfexprExpr = new AIfexprExpr.init_aifexprexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               tkwthennode4,
-                                               pexprnode5,
-                                               tkwelsenode6,
-                                               pexprnode7
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction767
+private class ReduceAction817
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pannotationnode1 = nodearraylist1
+                                       if pannotationnode1 != null then
+                                               listnode2.add(pannotationnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction818
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AOrExpr = new AOrExpr.init_aorexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
+                                       var listnode3 = new Array[Object]
+                                       var pannotationnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pannotationnode1 != null then
+                                               listnode3.add(pannotationnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction768
+private class ReduceAction839
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AAndExpr = new AAndExpr.init_aandexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist1
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist2
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction769
+private class ReduceAction840
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist5
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AOrElseExpr = new AOrElseExpr.init_aorelseexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwpublicnode5 = nodearraylist1
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction771
+private class ReduceAction841
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnotnode2 = nodearraylist1
-                                       assert tkwnotnode2 isa nullable TKwnot
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ANotExpr = new ANotExpr.init_anotexpr(
-                                               tkwnotnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwprivatenode5 = nodearraylist1
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction773
+private class ReduceAction842
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28060,19 +31569,34 @@ private class ReduceAction773
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AEqExpr = new AEqExpr.init_aeqexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwprotectednode5 = nodearraylist1
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction774
+private class ReduceAction843
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28081,250 +31605,404 @@ private class ReduceAction774
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AEeExpr = new AEeExpr.init_aeeexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwintrudenode5 = nodearraylist1
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist4
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction775
+private class ReduceAction844
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist3
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction776
+private class ReduceAction845
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ALtExpr = new ALtExpr.init_altexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist5
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction777
+private class ReduceAction846
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ALeExpr = new ALeExpr.init_aleexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist5
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction778
+private class ReduceAction847
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ALlExpr = new ALlExpr.init_allexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist5
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction779
+private class ReduceAction848
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AGtExpr = new AGtExpr.init_agtexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode9 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pexprnode8 = nodearraylist5
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction780
+private class ReduceAction850
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AGeExpr = new AGeExpr.init_ageexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
+                                       var pannotationnode1 = nodearraylist3
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction781
+private class ReduceAction851
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AGgExpr = new AGgExpr.init_aggexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction782
+private class ReduceAction852
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AStarshipExpr = new AStarshipExpr.init_astarshipexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction783
+private class ReduceAction853
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa nullable AType
-                                       var pexprnode1: nullable AIsaExpr = new AIsaExpr.init_aisaexpr(
-                                               pexprnode2,
-                                               ptypenode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction785
+private class ReduceAction854
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable APlusExpr = new APlusExpr.init_aplusexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction786
+private class ReduceAction855
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AMinusExpr = new AMinusExpr.init_aminusexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction788
+private class ReduceAction856
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28333,101 +32011,179 @@ private class ReduceAction788
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AStarExpr = new AStarExpr.init_astarexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction789
+private class ReduceAction857
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ASlashExpr = new ASlashExpr.init_aslashexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction790
+private class ReduceAction858
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable APercentExpr = new APercentExpr.init_apercentexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction792
+private class ReduceAction859
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa nullable TMinus
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AUminusExpr = new AUminusExpr.init_auminusexpr(
-                                               tminusnode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction793
+private class ReduceAction860
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwoncenode2 = nodearraylist1
-                                       assert tkwoncenode2 isa nullable TKwonce
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable AOnceExpr = new AOnceExpr.init_aonceexpr(
-                                               tkwoncenode2,
-                                               pexprnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction795
+private class ReduceAction861
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28436,69 +32192,68 @@ private class ReduceAction795
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa nullable TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var pexprsnode5 = nodearraylist4
-                                       assert pexprsnode5 isa nullable AExprs
-                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist3
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
                                                null,
-                                               pexprsnode5
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction796
+private class ReduceAction862
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tattridnode4 = nodearraylist5
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction797
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode4 = nodearraylist2
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction798
+private class ReduceAction863
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28509,239 +32264,440 @@ private class ReduceAction798
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tattridnode4 = nodearraylist6
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction799
+private class ReduceAction864
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tattridnode4 = nodearraylist7
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction801
+private class ReduceAction865
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode4 = nodearraylist3
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist5
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction802
+private class ReduceAction866
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode4 = nodearraylist4
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist4
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction804
+private class ReduceAction867
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist6
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction805
+private class ReduceAction868
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist6
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction806
+private class ReduceAction869
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist5
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist6
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction807
+private class ReduceAction870
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist6
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var pannotationsnode10 = nodearraylist6
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               pannotationsnode10
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction809
+private class ReduceAction871
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist2
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist3
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist6
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction810
+private class ReduceAction872
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
-                                       var tattridnode3 = nodearraylist3
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction826
+private class ReduceAction873
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var pexprsnode3 = nodearraylist2
-                                       assert pexprsnode3 isa nullable AExprs
-                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
-                                               pexprnode2,
-                                               pexprsnode3,
-                                               listnode4
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction827
+private class ReduceAction874
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -28749,29 +32705,43 @@ private class ReduceAction827
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa nullable TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var tidnode4 = nodearraylist6
-                                       assert tidnode4 isa nullable TId
-                                       var pexprsnode5 = nodearraylist7
-                                       assert pexprsnode5 isa nullable AExprs
-                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               tidnode4,
-                                               pexprsnode5
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction828
+private class ReduceAction875
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -28780,30 +32750,42 @@ private class ReduceAction828
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa nullable TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var tidnode4 = nodearraylist7
-                                       assert tidnode4 isa nullable TId
-                                       var pexprsnode5 = nodearraylist8
-                                       assert pexprsnode5 isa nullable AExprs
-                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               tidnode4,
-                                               pexprsnode5
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction829
+private class ReduceAction876
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -28812,29 +32794,43 @@ private class ReduceAction829
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa nullable TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa nullable AType
-                                       var tidnode4 = nodearraylist8
-                                       assert tidnode4 isa nullable TId
-                                       var pexprsnode5 = nodearraylist9
-                                       assert pexprsnode5 isa nullable AExprs
-                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               tidnode4,
-                                               pexprsnode5
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist7
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction831
+private class ReduceAction877
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -28844,26 +32840,40 @@ private class ReduceAction831
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tcbranode5 = nodearraylist9
-                                       assert tcbranode5 isa nullable TCbra
-                                       var pexprnode1: nullable ACrangeExpr = new ACrangeExpr.init_acrangeexpr(
-                                               tobranode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               tcbranode5,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction832
+private class ReduceAction878
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28878,32 +32888,45 @@ private class ReduceAction832
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tcbranode5 = nodearraylist9
-                                       assert tcbranode5 isa nullable TCbra
-                                       var pannotationsnode6 = nodearraylist10
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var pexprnode1: nullable ACrangeExpr = new ACrangeExpr.init_acrangeexpr(
-                                               tobranode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               tcbranode5,
-                                               pannotationsnode6
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction833
+private class ReduceAction879
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -28913,26 +32936,40 @@ private class ReduceAction833
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tobranode5 = nodearraylist9
-                                       assert tobranode5 isa nullable TObra
-                                       var pexprnode1: nullable AOrangeExpr = new AOrangeExpr.init_aorangeexpr(
-                                               tobranode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               tobranode5,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction834
+private class ReduceAction880
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -28947,343 +32984,713 @@ private class ReduceAction834
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tobranode5 = nodearraylist9
-                                       assert tobranode5 isa nullable TObra
-                                       var pannotationsnode6 = nodearraylist10
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var pexprnode1: nullable AOrangeExpr = new AOrangeExpr.init_aorangeexpr(
-                                               tobranode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               tobranode5,
-                                               pannotationsnode6
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction835
+private class ReduceAction881
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprsnode2 = nodearraylist1
-                                       assert pexprsnode2 isa nullable AExprs
-                                       var pexprnode1: nullable AArrayExpr = new AArrayExpr.init_aarrayexpr(
-                                               pexprsnode2,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist3
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist6
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist7
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction836
+private class ReduceAction882
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprsnode2 = nodearraylist1
-                                       assert pexprsnode2 isa nullable AExprs
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable AArrayExpr = new AArrayExpr.init_aarrayexpr(
-                                               pexprsnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction837
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa nullable TKwself
-                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
-                                               tkwselfnode2,
-                                               null
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction838
+private class ReduceAction883
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa nullable TKwself
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
-                                               tkwselfnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction839
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa nullable TKwtrue
-                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
-                                               tkwtruenode2,
-                                               null
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction840
+private class ReduceAction884
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa nullable TKwtrue
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
-                                               tkwtruenode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction841
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa nullable TKwfalse
-                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
-                                               tkwfalsenode2,
-                                               null
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction842
+private class ReduceAction885
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa nullable TKwfalse
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
-                                               tkwfalsenode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist5
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist7
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist8
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist9
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction843
+private class ReduceAction886
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa nullable TKwnull
-                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
-                                               tkwnullnode2,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist4
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist7
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist8
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction844
+private class ReduceAction887
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa nullable TKwnull
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
-                                               tkwnullnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction845
+private class ReduceAction888
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa nullable TNumber
-                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
-                                               tnumbernode2,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction846
+private class ReduceAction889
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa nullable TNumber
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
-                                               tnumbernode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction847
+private class ReduceAction890
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa nullable TFloat
-                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
-                                               tfloatnode2,
-                                               null
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var toparnode7 = nodearraylist6
+                                       assert toparnode7 isa nullable TOpar
+                                       var listnode8 = nodearraylist8
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcparnode10 = nodearraylist9
+                                       assert tcparnode10 isa nullable TCpar
+                                       var pannotationsnode11 = nodearraylist10
+                                       assert pannotationsnode11 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               toparnode7,
+                                               listnode9,
+                                               tcparnode10,
+                                               pannotationsnode11
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction848
+private class ReduceAction891
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa nullable TFloat
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
-                                               tfloatnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist2
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist3
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction849
+private class ReduceAction892
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tcharnode2 = nodearraylist1
-                                       assert tcharnode2 isa nullable TChar
-                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
-                                               tcharnode2,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwpublicnode5 = nodearraylist2
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction850
+private class ReduceAction893
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tcharnode2 = nodearraylist1
-                                       assert tcharnode2 isa nullable TChar
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
-                                               tcharnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprivatenode5 = nodearraylist2
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction851
+private class ReduceAction894
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa nullable TString
-                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
-                                               tstringnode2,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwprotectednode5 = nodearraylist2
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction852
+private class ReduceAction895
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa nullable TString
-                                       var pannotationsnode3 = nodearraylist2
-                                       assert pannotationsnode3 isa nullable AAnnotations
-                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
-                                               tstringnode2,
-                                               pannotationsnode3
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwintrudenode5 = nodearraylist2
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist4
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist5
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction854
+private class ReduceAction896
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -29293,59 +33700,79 @@ private class ReduceAction854
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tcparnode4 = nodearraylist5
-                                       assert tcparnode4 isa nullable TCpar
-                                       var pexprnode1: nullable AParExpr = new AParExpr.init_aparexpr(
-                                               toparnode2,
-                                               pexprnode3,
-                                               tcparnode4,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       var patidnode6 = nodearraylist3
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist4
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction855
+private class ReduceAction897
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tcparnode4 = nodearraylist5
-                                       assert tcparnode4 isa nullable TCpar
-                                       var pannotationsnode5 = nodearraylist6
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pexprnode1: nullable AParExpr = new AParExpr.init_aparexpr(
-                                               toparnode2,
-                                               pexprnode3,
-                                               tcparnode4,
-                                               pannotationsnode5
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwpublicnode5 = nodearraylist3
+                                       assert tkwpublicnode5 isa nullable TKwpublic
+                                       var pvisibilitynode4: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction856
+private class ReduceAction898
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -29353,37 +33780,40 @@ private class ReduceAction856
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa nullable TKwas
-                                       var toparnode4 = nodearraylist6
-                                       assert toparnode4 isa nullable TOpar
-                                       var ptypenode5 = nodearraylist8
-                                       assert ptypenode5 isa nullable AType
-                                       var tcparnode6 = nodearraylist10
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
-                                               pexprnode2,
-                                               tkwasnode3,
-                                               toparnode4,
-                                               ptypenode5,
-                                               tcparnode6
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprivatenode5 = nodearraylist3
+                                       assert tkwprivatenode5 isa nullable TKwprivate
+                                       var pvisibilitynode4: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction857
+private class ReduceAction899
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -29391,83 +33821,103 @@ private class ReduceAction857
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa nullable TKwas
-                                       var toparnode4 = nodearraylist6
-                                       assert toparnode4 isa nullable TOpar
-                                       var tkwnotnode5 = nodearraylist8
-                                       assert tkwnotnode5 isa nullable TKwnot
-                                       var tkwnullnode6 = nodearraylist10
-                                       assert tkwnullnode6 isa nullable TKwnull
-                                       var tcparnode7 = nodearraylist12
-                                       assert tcparnode7 isa nullable TCpar
-                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
-                                               pexprnode2,
-                                               tkwasnode3,
-                                               toparnode4,
-                                               tkwnotnode5,
-                                               tkwnullnode6,
-                                               tcparnode7
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwprotectednode5 = nodearraylist3
+                                       assert tkwprotectednode5 isa nullable TKwprotected
+                                       var pvisibilitynode4: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction858
+private class ReduceAction900
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       listnode4 = concat(listnode4, listnode2)
-                                       if pexprnode3 != null then
-                                               listnode4.add(pexprnode3)
-                                       end
-                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode4,
+                                       var listnode9 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var tkwintrudenode5 = nodearraylist3
+                                       assert tkwintrudenode5 isa nullable TKwintrude
+                                       var pvisibilitynode4: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode5
+                                       )
+                                       var patidnode6 = nodearraylist5
+                                       assert patidnode6 isa nullable AAtid
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode6,
+                                               null,
+                                               listnode9,
+                                               null,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction859
+private class ReduceAction901
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       listnode5 = concat(listnode5, listnode2)
-                                       listnode5 = concat(listnode5, listnode3)
-                                       if pexprnode4 != null then
-                                               listnode5.add(pexprnode4)
-                                       end
-                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode5,
+                                       var listnode7 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var ppropdefnode1: nullable AAnnotPropdef = new AAnnotPropdef.init_aannotpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode7,
+                                               null,
                                                null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction860
+private class ReduceAction902
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -29475,366 +33925,356 @@ private class ReduceAction860
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       listnode4 = concat(listnode4, listnode2)
-                                       if pexprnode3 != null then
-                                               listnode4.add(pexprnode3)
-                                       end
-                                       var pannotationsnode5 = nodearraylist3
-                                       assert pannotationsnode5 isa nullable AAnnotations
-                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode4,
-                                               pannotationsnode5
+                                       var listnode7 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var pannotationsnode9 = nodearraylist3
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAnnotPropdef = new AAnnotPropdef.init_aannotpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode7,
+                                               null,
+                                               pannotationsnode9
                                        )
-                                       node_list = pexprnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction861
+private class ReduceAction903
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       listnode5 = concat(listnode5, listnode2)
-                                       listnode5 = concat(listnode5, listnode3)
-                                       if pexprnode4 != null then
-                                               listnode5.add(pexprnode4)
-                                       end
-                                       var pannotationsnode6 = nodearraylist4
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode5,
-                                               pannotationsnode6
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist3
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist6
+                                       assert tcparnode9 isa nullable TCpar
+                                       var ppropdefnode1: nullable AAnnotPropdef = new AAnnotPropdef.init_aannotpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction862
+private class ReduceAction904
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pexprnode1 = nodearraylist1
-                                       var pexprnode2 = nodearraylist3
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       node_list = listnode3
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist3
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist6
+                                       assert tcparnode9 isa nullable TCpar
+                                       var pannotationsnode10 = nodearraylist7
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var ppropdefnode1: nullable AAnnotPropdef = new AAnnotPropdef.init_aannotpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               pannotationsnode10
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction863
+private class ReduceAction905
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstartstringnode2 = nodearraylist1
-                                       assert tstartstringnode2 isa nullable TStartString
-                                       var pexprnode1: nullable AStartStringExpr = new AStartStringExpr.init_astartstringexpr(
-                                               tstartstringnode2
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var listnode7 = nodearraylist3
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var ppropdefnode1: nullable AAnnotPropdef = new AAnnotPropdef.init_aannotpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
                                        )
-                                       node_list = pexprnode1
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction865
+private class ReduceAction909
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tmidstringnode2 = nodearraylist1
-                                       assert tmidstringnode2 isa nullable TMidString
-                                       var pexprnode1: nullable AMidStringExpr = new AMidStringExpr.init_amidstringexpr(
-                                               tmidstringnode2
+                                       var ptypenode2 = nodearraylist1
+                                       assert ptypenode2 isa nullable AType
+                                       var pexprnode1: nullable ATypeExpr = new ATypeExpr.init_atypeexpr(
+                                               ptypenode2
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction866
+private class ReduceAction912
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tendstringnode2 = nodearraylist1
-                                       assert tendstringnode2 isa nullable TEndString
-                                       var pexprnode1: nullable AEndStringExpr = new AEndStringExpr.init_aendstringexpr(
-                                               tendstringnode2
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pmethidnode3 = nodearraylist4
+                                       assert pmethidnode3 isa nullable AMethid
+                                       var pexprnode1: nullable AMethidExpr = new AMethidExpr.init_amethidexpr(
+                                               pexprnode2,
+                                               pmethidnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction867
+private class ReduceAction913
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tatnode2 = nodearraylist1
-                                       assert tatnode2 isa nullable TAt
-                                       var pannotationnode4 = nodearraylist2
-                                       assert pannotationnode4 isa nullable AAnnotation
-                                       if pannotationnode4 != null then
-                                               listnode5.add(pannotationnode4)
-                                       end
-                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               tatnode2,
-                                               null,
-                                               listnode5,
-                                               null
+                                       var pexprnode3 = nodearraylist1
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tquestnode4 = nodearraylist2
+                                       assert tquestnode4 isa nullable TQuest
+                                       var pexprnode2: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode3,
+                                               tquestnode4
                                        )
-                                       node_list = pannotationsnode1
+                                       var pmethidnode5 = nodearraylist5
+                                       assert pmethidnode5 isa nullable AMethid
+                                       var pexprnode1: nullable AMethidExpr = new AMethidExpr.init_amethidexpr(
+                                               pexprnode2,
+                                               pmethidnode5
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction868
+private class ReduceAction914
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tatnode2 = nodearraylist1
-                                       assert tatnode2 isa nullable TAt
-                                       var toparnode3 = nodearraylist2
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               tatnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr
+                                       var pmethidnode3 = nodearraylist1
+                                       assert pmethidnode3 isa nullable AMethid
+                                       var pexprnode1: nullable AMethidExpr = new AMethidExpr.init_amethidexpr(
+                                               pexprnode2,
+                                               pmethidnode3
                                        )
-                                       node_list = pannotationsnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction869
+private class ReduceAction915
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               null,
-                                               listnode4,
-                                               null,
-                                               null
+                                       var pannotationsnode2 = nodearraylist1
+                                       assert pannotationsnode2 isa nullable AAnnotations
+                                       var pexprnode1: nullable AAtExpr = new AAtExpr.init_aatexpr(
+                                               pannotationsnode2
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction870
+private class ReduceAction916
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationsnode6 = nodearraylist2
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               null,
-                                               listnode4,
-                                               null,
-                                               pannotationsnode6
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var patidnode1: nullable AIdAtid = new AIdAtid.init_aidatid(
+                                               tidnode2
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = patidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction871
+private class ReduceAction917
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist2
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               null
+                                       var tkwexternnode2 = nodearraylist1
+                                       assert tkwexternnode2 isa nullable TKwextern
+                                       var patidnode1: nullable AKwexternAtid = new AKwexternAtid.init_akwexternatid(
+                                               tkwexternnode2
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = patidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction872
+private class ReduceAction918
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist2
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationsnode7 = nodearraylist7
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               pannotationsnode7
+                                       var tkwabstractnode2 = nodearraylist1
+                                       assert tkwabstractnode2 isa nullable TKwabstract
+                                       var patidnode1: nullable AKwabstractAtid = new AKwabstractAtid.init_akwabstractatid(
+                                               tkwabstractnode2
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = patidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction873
+private class ReduceAction919
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode5,
-                                               null
+                                       var listnode4 = new Array[Object]
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcparnode5 = nodearraylist4
+                                       assert tcparnode5 isa nullable TCpar
+                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
+                                               toparnode2,
+                                               listnode4,
+                                               tcparnode5
                                        )
-                                       node_list = pannotationsnode1
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction874
+private class ReduceAction920
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pannotationnode1 = nodearraylist1
-                                       if pannotationnode1 != null then
-                                               listnode2.add(pannotationnode1)
-                                       end
-                                       node_list = listnode2
+                                       var listnode3 = new Array[Object]
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var tcparnode4 = nodearraylist3
+                                       assert tcparnode4 isa nullable TCpar
+                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
+                                               toparnode2,
+                                               listnode3,
+                                               tcparnode4
+                                       )
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction875
+private class ReduceAction922
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var pannotationnode1 = nodearraylist1
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       if pannotationnode1 != null then
-                                               listnode3.add(pannotationnode1)
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
                                        end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode3
+                                       )
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction877
+private class ReduceAction924
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               null,
-                                               listnode4,
-                                               null,
-                                               null
+                                       var listnode2 = new Array[Object]
+                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode2
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction878
+private class ReduceAction925
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -29844,301 +34284,309 @@ private class ReduceAction878
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationsnode6 = nodearraylist3
-                                       assert pannotationsnode6 isa nullable AAnnotations
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               null,
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcbranode5 = nodearraylist4
+                                       assert tcbranode5 isa nullable TCbra
+                                       var pexprsnode1: nullable ABraExprs = new ABraExprs.init_abraexprs(
+                                               tobranode2,
                                                listnode4,
-                                               null,
-                                               pannotationsnode6
+                                               tcbranode5
                                        )
-                                       node_list = pannotationnode1
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction879
+private class ReduceAction927
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist3
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               null
-                                       )
-                                       node_list = pannotationnode1
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist3
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction880
+private class ReduceAction928
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist3
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationsnode7 = nodearraylist7
-                                       assert pannotationsnode7 isa nullable AAnnotations
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               pannotationsnode7
-                                       )
-                                       node_list = pannotationnode1
+                                       var pexprnode1 = nodearraylist3
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction881
+private class ReduceAction929
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               null,
-                                               listnode5,
-                                               null,
-                                               null
-                                       )
-                                       node_list = pannotationnode1
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist3
+                                       assert listnode1 isa Array[Object]
+                                       listnode2 = concat(listnode2, listnode1)
+                                       node_list = listnode2
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction882
+private class ReduceAction930
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationnode1 = nodearraylist3
-                                       node_list = pannotationnode1
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       listnode2 = concat(listnode2, listnode1)
+                                       node_list = listnode2
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction883
+private class ReduceAction931
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
-                                       var patargnode1 = nodearraylist1
-                                       if patargnode1 != null then
-                                               listnode2.add(patargnode1)
+                                       var tidnode1 = nodearraylist1
+                                       if tidnode1 != null then
+                                               listnode2.add(tidnode1)
                                        end
                                        node_list = listnode2
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction884
+private class ReduceAction932
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var patargnode1 = nodearraylist1
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       if patargnode1 != null then
-                                               listnode3.add(patargnode1)
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       var tidnode2 = nodearraylist4
+                                       listnode3 = concat(listnode3, listnode1)
+                                       if tidnode2 != null then
+                                               listnode3.add(tidnode2)
                                        end
-                                       listnode3 = concat(listnode3, listnode2)
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction885
+private class ReduceAction933
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var patargnode1 = nodearraylist3
-                                       node_list = patargnode1
+                                       var listnode3 = new Array[Object]
+                                       var tidnode4 = nodearraylist1
+                                       assert tidnode4 isa nullable TId
+                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
+                                               null,
+                                               listnode3,
+                                               tidnode4
+                                       )
+                                       node_list = pmodulenamenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction886
+private class ReduceAction934
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode2 = nodearraylist1
-                                       assert ptypenode2 isa nullable AType
-                                       var patargnode1: nullable ATypeAtArg = new ATypeAtArg.init_atypeatarg(
-                                               ptypenode2
+                                       var listnode4 = new Array[Object]
+                                       var listnode3 = nodearraylist1
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tidnode5 = nodearraylist2
+                                       assert tidnode5 isa nullable TId
+                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
+                                               null,
+                                               listnode4,
+                                               tidnode5
                                        )
-                                       node_list = patargnode1
+                                       node_list = pmodulenamenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction887
+private class ReduceAction935
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       var patargnode1: nullable AExprAtArg = new AExprAtArg.init_aexpratarg(
-                                               pexprnode2
+                                       var listnode3 = new Array[Object]
+                                       var tquadnode2 = nodearraylist1
+                                       assert tquadnode2 isa nullable TQuad
+                                       var tidnode4 = nodearraylist3
+                                       assert tidnode4 isa nullable TId
+                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
+                                               tquadnode2,
+                                               listnode3,
+                                               tidnode4
                                        )
-                                       node_list = patargnode1
+                                       node_list = pmodulenamenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction889
+private class ReduceAction936
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode2 = nodearraylist1
-                                       assert pannotationsnode2 isa nullable AAnnotations
-                                       var patargnode1: nullable AAtAtArg = new AAtAtArg.init_aatatarg(
-                                               pannotationsnode2
+                                       var listnode4 = new Array[Object]
+                                       var tquadnode2 = nodearraylist1
+                                       assert tquadnode2 isa nullable TQuad
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tidnode5 = nodearraylist4
+                                       assert tidnode5 isa nullable TId
+                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
+                                               tquadnode2,
+                                               listnode4,
+                                               tidnode5
                                        )
-                                       node_list = patargnode1
+                                       node_list = pmodulenamenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction890
+private class ReduceAction937
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa nullable TId
-                                       var patidnode1: nullable AIdAtid = new AIdAtid.init_aidatid(
-                                               tidnode2
+                                       var listnode2 = new Array[Object]
+                                       var tclassidnode3 = nodearraylist1
+                                       assert tclassidnode3 isa nullable TClassid
+                                       var pqualifiednode1: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode2,
+                                               tclassidnode3
                                        )
-                                       node_list = patidnode1
+                                       node_list = pqualifiednode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction891
+private class ReduceAction938
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist2
-                                       assert tidnode2 isa nullable TId
-                                       var patidnode1: nullable AIdAtid = new AIdAtid.init_aidatid(
-                                               tidnode2
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       listnode3 = concat(listnode3, listnode2)
+                                       var tclassidnode4 = nodearraylist2
+                                       assert tclassidnode4 isa nullable TClassid
+                                       var pqualifiednode1: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode3,
+                                               tclassidnode4
                                        )
-                                       node_list = patidnode1
+                                       node_list = pqualifiednode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction892
+private class ReduceAction939
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist3
-                                       assert tidnode2 isa nullable TId
-                                       var patidnode1: nullable AIdAtid = new AIdAtid.init_aidatid(
-                                               tidnode2
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       listnode3 = concat(listnode3, listnode2)
+                                       var pqualifiednode1: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode3,
+                                               null
                                        )
-                                       node_list = patidnode1
+                                       node_list = pqualifiednode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction894
+private class ReduceAction941
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwreadablenode2 = nodearraylist1
-                                       assert tkwreadablenode2 isa nullable TKwreadable
-                                       var patidnode1: nullable AKwreadableAtid = new AKwreadableAtid.init_akwreadableatid(
-                                               tkwreadablenode2
+                                       var tclassidnode3 = nodearraylist1
+                                       assert tclassidnode3 isa nullable TClassid
+                                       var pqclassidnode1: nullable AQclassid = new AQclassid.init_aqclassid(
+                                               null,
+                                               tclassidnode3
                                        )
-                                       node_list = patidnode1
+                                       node_list = pqclassidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction895
+private class ReduceAction942
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreadablenode2 = nodearraylist2
-                                       assert tkwreadablenode2 isa nullable TKwreadable
-                                       var patidnode1: nullable AKwreadableAtid = new AKwreadableAtid.init_akwreadableatid(
-                                               tkwreadablenode2
+                                       var listnode3 = new Array[Object]
+                                       var tclassidnode4 = nodearraylist1
+                                       assert tclassidnode4 isa nullable TClassid
+                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode3,
+                                               tclassidnode4
                                        )
-                                       node_list = patidnode1
+                                       var tclassidnode5 = nodearraylist2
+                                       assert tclassidnode5 isa nullable TClassid
+                                       var pqclassidnode1: nullable AQclassid = new AQclassid.init_aqclassid(
+                                               pqualifiednode2,
+                                               tclassidnode5
+                                       )
+                                       node_list = pqclassidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction896
+private class ReduceAction943
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30146,95 +34594,101 @@ private class ReduceAction896
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreadablenode2 = nodearraylist3
-                                       assert tkwreadablenode2 isa nullable TKwreadable
-                                       var patidnode1: nullable AKwreadableAtid = new AKwreadableAtid.init_akwreadableatid(
-                                               tkwreadablenode2
+                                       var listnode4 = new Array[Object]
+                                       var listnode3 = nodearraylist1
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tclassidnode5 = nodearraylist2
+                                       assert tclassidnode5 isa nullable TClassid
+                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode4,
+                                               tclassidnode5
                                        )
-                                       node_list = patidnode1
+                                       var tclassidnode6 = nodearraylist3
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqclassidnode1: nullable AQclassid = new AQclassid.init_aqclassid(
+                                               pqualifiednode2,
+                                               tclassidnode6
+                                       )
+                                       node_list = pqclassidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction898
+private class ReduceAction944
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwritablenode2 = nodearraylist1
-                                       assert tkwwritablenode2 isa nullable TKwwritable
-                                       var patidnode1: nullable AKwwritableAtid = new AKwwritableAtid.init_akwwritableatid(
-                                               tkwwritablenode2
+                                       var listnode4 = new Array[Object]
+                                       var listnode3 = nodearraylist1
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var pqualifiednode2: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode4,
+                                               null
                                        )
-                                       node_list = patidnode1
+                                       var tclassidnode6 = nodearraylist2
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqclassidnode1: nullable AQclassid = new AQclassid.init_aqclassid(
+                                               pqualifiednode2,
+                                               tclassidnode6
+                                       )
+                                       node_list = pqclassidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction899
+private class ReduceAction945
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwritablenode2 = nodearraylist2
-                                       assert tkwwritablenode2 isa nullable TKwwritable
-                                       var patidnode1: nullable AKwwritableAtid = new AKwwritableAtid.init_akwwritableatid(
-                                               tkwwritablenode2
-                                       )
-                                       node_list = patidnode1
+                                       var pmethidnode1 = nodearraylist1
+                                       node_list = pmethidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction900
+private class ReduceAction946
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwritablenode2 = nodearraylist3
-                                       assert tkwwritablenode2 isa nullable TKwwritable
-                                       var patidnode1: nullable AKwwritableAtid = new AKwwritableAtid.init_akwwritableatid(
-                                               tkwwritablenode2
-                                       )
-                                       node_list = patidnode1
+                                       var pmethidnode1 = nodearraylist2
+                                       node_list = pmethidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction902
+private class ReduceAction947
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwimportnode2 = nodearraylist1
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var patidnode1: nullable AKwimportAtid = new AKwimportAtid.init_akwimportatid(
-                                               tkwimportnode2
-                                       )
-                                       node_list = patidnode1
+                                       var pmethidnode1 = nodearraylist3
+                                       node_list = pmethidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction903
+private class ReduceAction949
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwimportnode2 = nodearraylist2
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var patidnode1: nullable AKwimportAtid = new AKwimportAtid.init_akwimportatid(
-                                               tkwimportnode2
-                                       )
-                                       node_list = patidnode1
+                                       var tidnode1 = nodearraylist1
+                                       node_list = tidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction904
+private class ReduceAction950
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30242,138 +34696,102 @@ private class ReduceAction904
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwimportnode2 = nodearraylist3
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var patidnode1: nullable AKwimportAtid = new AKwimportAtid.init_akwimportatid(
-                                               tkwimportnode2
-                                       )
-                                       node_list = patidnode1
+                                       var tclassidnode1 = nodearraylist1
+                                       node_list = tclassidnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction906
+private class ReduceAction952
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcparnode5 = nodearraylist4
-                                       assert tcparnode5 isa nullable TCpar
-                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
-                                               toparnode2,
-                                               listnode4,
-                                               tcparnode5
-                                       )
-                                       node_list = pexprsnode1
+                                       var tkwendnode1 = nodearraylist1
+                                       node_list = tkwendnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction907
+private class ReduceAction953
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var toparnode2 = nodearraylist1
-                                       assert toparnode2 isa nullable TOpar
-                                       var tcparnode4 = nodearraylist3
-                                       assert tcparnode4 isa nullable TCpar
-                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
-                                               toparnode2,
-                                               listnode3,
-                                               tcparnode4
-                                       )
-                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction908
+private class ReduceAction956
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var listnode2 = new Array[Object]
-                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
-                                               listnode2
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       listnode3 = concat(listnode3, listnode2)
+                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
+                                               listnode3
                                        )
-                                       node_list = pexprsnode1
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction910
+private class ReduceAction957
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa nullable AExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       listnode3 = concat(listnode3, listnode2)
+                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
                                                listnode3
                                        )
-                                       node_list = pexprsnode1
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction913
+private class ReduceAction960
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       node_list = null
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction962
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa nullable TObra
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tcbranode5 = nodearraylist4
-                                       assert tcbranode5 isa nullable TCbra
-                                       var pexprsnode1: nullable ABraExprs = new ABraExprs.init_abraexprs(
-                                               tobranode2,
-                                               listnode4,
-                                               tcbranode5
-                                       )
-                                       node_list = pexprsnode1
+                                       node_list = null
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction914
+private class ReduceAction963
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = nodearraylist1
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
+                                       var pdocnode1 = nodearraylist2
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction915
+private class ReduceAction964
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30381,19 +34799,12 @@ private class ReduceAction915
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pexprnode1 = nodearraylist1
-                                       var listnode2 = nodearraylist3
-                                       assert listnode2 isa Array[Object]
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pdocnode1 = nodearraylist3
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction916
+private class ReduceAction966
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30402,89 +34813,96 @@ private class ReduceAction916
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist3
-                                       node_list = pexprnode1
+                                       var pdocnode1 = nodearraylist4
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction917
+private class ReduceAction968
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var tidnode1 = nodearraylist1
-                                       if tidnode1 != null then
-                                               listnode2.add(tidnode1)
-                                       end
-                                       node_list = listnode2
+                                       var pdocnode1 = nodearraylist1
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction918
+private class ReduceAction969
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction972
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var tidnode2 = nodearraylist5
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if tidnode2 != null then
-                                               listnode3.add(tidnode2)
-                                       end
-                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction919
+private class ReduceAction1511
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tidnode4 = nodearraylist1
-                                       assert tidnode4 isa nullable TId
-                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
-                                               null,
-                                               listnode3,
-                                               tidnode4
+                                       var tkwissetnode2 = nodearraylist1
+                                       assert tkwissetnode2 isa nullable TKwisset
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tattridnode4 = nodearraylist4
+                                       assert tattridnode4 isa nullable TAttrid
+                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
+                                               tkwissetnode2,
+                                               pexprnode3,
+                                               tattridnode4
                                        )
-                                       node_list = pmodulenamenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction920
+private class ReduceAction1512
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode3 = nodearraylist1
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tidnode5 = nodearraylist2
-                                       assert tidnode5 isa nullable TId
-                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tidnode6 = nodearraylist3
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
                                                null,
-                                               listnode4,
-                                               tidnode5
+                                               tidnode6
                                        )
-                                       node_list = pmodulenamenode1
+                                       var pexprsnode7 = nodearraylist4
+                                       assert pexprsnode7 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction921
+private class ReduceAction1513
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30492,158 +34910,388 @@ private class ReduceAction921
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tquadnode2 = nodearraylist1
-                                       assert tquadnode2 isa nullable TQuad
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa nullable TId
-                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
-                                               tquadnode2,
-                                               listnode3,
-                                               tidnode4
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tidnode6 = nodearraylist3
+                                       assert tidnode6 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode6
                                        )
-                                       node_list = pmodulenamenode1
+                                       var listnode8 = new Array[Object]
+                                       var pexprsnode7: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode7
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction922
+private class ReduceAction1514
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tquadnode2 = nodearraylist1
-                                       assert tquadnode2 isa nullable TQuad
-                                       var listnode3 = nodearraylist3
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tidnode5 = nodearraylist4
-                                       assert tidnode5 isa nullable TId
-                                       var pmodulenamenode1: nullable AModuleName = new AModuleName.init_amodulename(
-                                               tquadnode2,
-                                               listnode4,
-                                               tidnode5
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist3
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist4
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist5
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
                                        )
-                                       node_list = pmodulenamenode1
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction923
+private class ReduceAction1515
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode1 = nodearraylist1
-                                       node_list = tidnode1
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var tclassidnode7 = nodearraylist3
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist4
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode9
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction924
+private class ReduceAction1516
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tclassidnode1 = nodearraylist1
-                                       node_list = tclassidnode1
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist4
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist6
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction925
+private class ReduceAction1517
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var tclassidnode8 = nodearraylist4
+                                       assert tclassidnode8 isa nullable TClassid
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               tclassidnode8
+                                       )
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction927
+private class ReduceAction1518
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       listnode3 = concat(listnode3, listnode2)
-                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
-                                               listnode3
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
                                        )
-                                       node_list = pdocnode1
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var pexprsnode10 = nodearraylist5
+                                       assert pexprsnode10 isa nullable AExprs
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction928
+private class ReduceAction1519
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist2
-                                       assert listnode2 isa Array[Object]
-                                       listnode3 = concat(listnode3, listnode2)
-                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
-                                               listnode3
+                                       var tampnode2 = nodearraylist1
+                                       assert tampnode2 isa nullable TAmp
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+                                       listnode7 = concat(listnode7, listnode6)
+                                       var pqualifiednode5: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode7,
+                                               null
                                        )
-                                       node_list = pdocnode1
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pqidnode4: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode5,
+                                               tidnode9
+                                       )
+                                       var listnode11 = new Array[Object]
+                                       var pexprsnode10: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode11
+                                       )
+                                       var pexprnode1: nullable ACallrefExpr = new ACallrefExpr.init_acallrefexpr(
+                                               tampnode2,
+                                               pexprnode3,
+                                               pqidnode4,
+                                               pexprsnode10
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction930
+private class ReduceAction1521
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       node_list = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tattridnode3 = nodearraylist3
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
+                                               pexprnode2,
+                                               tattridnode3
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction931
+private class ReduceAction1522
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode1 = nodearraylist1
-                                       node_list = pdocnode1
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist2
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
+                                       )
+                                       var pexprsnode6 = nodearraylist3
+                                       assert pexprsnode6 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction932
+private class ReduceAction1523
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode5 = nodearraylist2
+                                       assert tidnode5 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               null,
+                                               tidnode5
+                                       )
+                                       var listnode7 = new Array[Object]
+                                       var pexprsnode6: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode6
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction933
+private class ReduceAction1524
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist2
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var pexprsnode8 = nodearraylist4
+                                       assert pexprsnode8 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
+                                       )
+                                       node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1313
+private class ReduceAction1525
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30651,85 +35299,150 @@ private class ReduceAction1313
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tattridnode4 = nodearraylist3
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode6 = nodearraylist2
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode5,
+                                               tclassidnode6
+                                       )
+                                       var tidnode7 = nodearraylist3
+                                       assert tidnode7 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode7
+                                       )
+                                       var listnode9 = new Array[Object]
+                                       var pexprsnode8: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode9
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode8
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1314
+private class ReduceAction1526
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwissetnode2 = nodearraylist1
-                                       assert tkwissetnode2 isa nullable TKwisset
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa nullable AExpr
-                                       var tattridnode4 = nodearraylist4
-                                       assert tattridnode4 isa nullable TAttrid
-                                       var pexprnode1: nullable AIssetAttrExpr = new AIssetAttrExpr.init_aissetattrexpr(
-                                               tkwissetnode2,
-                                               pexprnode3,
-                                               tattridnode4
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist3
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist4
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist5
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               pqidnode3,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1317
+private class ReduceAction1527
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist2
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tclassidnode7 = nodearraylist3
+                                       assert tclassidnode7 isa nullable TClassid
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               tclassidnode7
+                                       )
+                                       var tidnode8 = nodearraylist4
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tattridnode3
+                                               pqidnode3,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1318
+private class ReduceAction1528
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tattridnode3 = nodearraylist3
-                                       assert tattridnode3 isa nullable TAttrid
-                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var pexprsnode9 = nodearraylist4
+                                       assert pexprsnode9 isa nullable AExprs
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tattridnode3
+                                               pqidnode3,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1321
+private class ReduceAction1529
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30737,63 +35450,73 @@ private class ReduceAction1321
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
+                                       var listnode6 = new Array[Object]
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pqualifiednode4: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode6,
+                                               null
+                                       )
+                                       var tidnode8 = nodearraylist3
+                                       assert tidnode8 isa nullable TId
+                                       var pqidnode3: nullable AQid = new AQid.init_aqid(
+                                               pqualifiednode4,
+                                               tidnode8
+                                       )
+                                       var listnode10 = new Array[Object]
+                                       var pexprsnode9: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode10
+                                       )
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                               pqidnode3,
+                                               pexprsnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1322
+private class ReduceAction1532
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa nullable TId
-                                       var pexprsnode4 = nodearraylist4
+                                       var tkwinitnode3 = nodearraylist2
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var pexprsnode4 = nodearraylist3
                                        assert pexprsnode4 isa nullable AExprs
-                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               pexprsnode4,
-                                               listnode5
+                                               tkwinitnode3,
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1329
+private class ReduceAction1533
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tkwinitnode3 = nodearraylist2
                                        assert tkwinitnode3 isa nullable TKwinit
-                                       var pexprsnode4 = nodearraylist3
-                                       assert pexprsnode4 isa nullable AExprs
+                                       var listnode5 = new Array[Object]
+                                       var pexprsnode4: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode5
+                                       )
                                        var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
@@ -30803,7 +35526,7 @@ private class ReduceAction1329
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1353
+private class ReduceAction1560
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30816,7 +35539,28 @@ private class ReduceAction1353
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1354
+private class ReduceAction1561
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tquestnode3 = nodearraylist2
+                                       assert tquestnode3 isa nullable TQuest
+                                       var pexprnode1: nullable ASafeExpr = new ASafeExpr.init_asafeexpr(
+                                               pexprnode2,
+                                               tquestnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction1562
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30826,7 +35570,7 @@ private class ReduceAction1354
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1764
+private class ReduceAction1746
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30841,7 +35585,7 @@ private class ReduceAction1764
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1765
+private class ReduceAction1747
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30860,7 +35604,7 @@ private class ReduceAction1765
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1766
+private class ReduceAction1748
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30875,7 +35619,7 @@ private class ReduceAction1766
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1767
+private class ReduceAction1749
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30894,7 +35638,7 @@ private class ReduceAction1767
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1768
+private class ReduceAction1750
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30909,7 +35653,7 @@ private class ReduceAction1768
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1769
+private class ReduceAction1751
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30928,22 +35672,7 @@ private class ReduceAction1769
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1770
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var ppropdefnode1 = nodearraylist1
-                                       if ppropdefnode1 != null then
-                                               listnode2.add(ppropdefnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1771
+private class ReduceAction1753
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30953,31 +35682,16 @@ private class ReduceAction1771
                                        var listnode3 = new Array[Object]
                                        var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var ppropdefnode2 = nodearraylist2
+                                       var pformaldefnode2 = nodearraylist2
                                        listnode3 = concat(listnode3, listnode1)
-                                       if ppropdefnode2 != null then
-                                               listnode3.add(ppropdefnode2)
+                                       if pformaldefnode2 != null then
+                                               listnode3.add(pformaldefnode2)
                                        end
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1772
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var psuperclassnode1 = nodearraylist1
-                                       if psuperclassnode1 != null then
-                                               listnode2.add(psuperclassnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1773
+private class ReduceAction1755
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -30987,31 +35701,16 @@ private class ReduceAction1773
                                        var listnode3 = new Array[Object]
                                        var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var psuperclassnode2 = nodearraylist2
+                                       var ppropdefnode2 = nodearraylist2
                                        listnode3 = concat(listnode3, listnode1)
-                                       if psuperclassnode2 != null then
-                                               listnode3.add(psuperclassnode2)
+                                       if ppropdefnode2 != null then
+                                               listnode3.add(ppropdefnode2)
                                        end
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1776
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pformaldefnode1 = nodearraylist1
-                                       if pformaldefnode1 != null then
-                                               listnode2.add(pformaldefnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1777
+private class ReduceAction1757
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31021,16 +35720,16 @@ private class ReduceAction1777
                                        var listnode3 = new Array[Object]
                                        var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var pformaldefnode2 = nodearraylist2
+                                       var pannotationnode2 = nodearraylist2
                                        listnode3 = concat(listnode3, listnode1)
-                                       if pformaldefnode2 != null then
-                                               listnode3.add(pformaldefnode2)
+                                       if pannotationnode2 != null then
+                                               listnode3.add(pannotationnode2)
                                        end
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1778
+private class ReduceAction1758
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31045,7 +35744,7 @@ private class ReduceAction1778
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1779
+private class ReduceAction1759
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31064,41 +35763,7 @@ private class ReduceAction1779
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1780
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pclosuredeclnode1 = nodearraylist1
-                                       if pclosuredeclnode1 != null then
-                                               listnode2.add(pclosuredeclnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1781
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var pclosuredeclnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if pclosuredeclnode2 != null then
-                                               listnode3.add(pclosuredeclnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1782
+private class ReduceAction1760
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31113,7 +35778,7 @@ private class ReduceAction1782
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1783
+private class ReduceAction1761
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31132,7 +35797,7 @@ private class ReduceAction1783
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1785
+private class ReduceAction1763
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31151,22 +35816,7 @@ private class ReduceAction1785
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1786
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = nodearraylist1
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1787
+private class ReduceAction1765
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31185,7 +35835,7 @@ private class ReduceAction1787
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1789
+private class ReduceAction1771
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31203,45 +35853,7 @@ private class ReduceAction1789
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1791
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var pannotationnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if pannotationnode2 != null then
-                                               listnode3.add(pannotationnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1795
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var patargnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if patargnode2 != null then
-                                               listnode3.add(patargnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1799
+private class ReduceAction1779
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31260,7 +35872,7 @@ private class ReduceAction1799
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1800
+private class ReduceAction1780
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31275,7 +35887,7 @@ private class ReduceAction1800
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1801
+private class ReduceAction1781
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -31294,37 +35906,3 @@ private class ReduceAction1801
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1802
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var teolnode1 = nodearraylist1
-                                       if teolnode1 != null then
-                                               listnode2.add(teolnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1803
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var teolnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if teolnode2 != null then
-                                               listnode3.add(teolnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end