parser: closure syntax use '!' instead of 'with'
[nit.git] / src / parser / parser.nit
index 4ada113..dd8f14b 100644 (file)
@@ -1,19 +1,19 @@
 # Parser.
-# This file was generated by SableCC (http://www.sablecc.org/). 
+# This file was generated by SableCC (http://www.sablecc.org/).
 package parser
 
-import parser_prod
+intrude import parser_prod
 intrude import parser_tables
 
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number
-       readable writable attr _state: Int
+       readable writable var _state: Int
 
        # The node stored with the state in the stack
-       readable writable attr _nodes: Object 
+       readable writable var _nodes: nullable Object
 
-       init(state: Int, nodes: Object)
+       init(state: Int, nodes: nullable Object)
        do
                _state = state
                _nodes = nodes
@@ -23,13 +23,13 @@ end
 class Parser
 special ParserTable
        # Associated lexer
-       attr _lexer: Lexer
+       var _lexer: Lexer
 
        # Stack of pushed states and productions
-       attr _stack: Array[State]
+       var _stack: Array[State]
 
        # Position in the stack
-       attr _stack_pos: Int
+       var _stack_pos: Int
 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)
@@ -43,7 +43,7 @@ special ParserTable
        end
 
        # Do a transition in the automata
-       private meth go_to(index: Int): Int
+       private fun go_to(index: Int): Int
        do
                var state = state
                var table = _goto_table[index]
@@ -67,7 +67,7 @@ special ParserTable
        end
 
        # Push someting in the state stack
-       private meth push(numstate: Int, list_node: Object)
+       private fun push(numstate: Int, list_node: nullable Object)
        do
                var pos = _stack_pos + 1
                _stack_pos = pos
@@ -81,13 +81,13 @@ special ParserTable
        end
 
        # The current state
-       private meth state: Int
+       private fun state: Int
        do
                return _stack[_stack_pos].state
        end
 
        # Pop something from the stack state
-       private meth pop: Object
+       private fun pop: nullable Object
        do
                var res = _stack[_stack_pos].nodes
                _stack_pos = _stack_pos -1
@@ -95,19 +95,14 @@ special ParserTable
        end
 
        # Build and return a full AST.
-       meth parse: Start
+       fun parse: Start
        do
                push(0, null)
 
-               var ign: List[Token] = null
                var lexer = _lexer
                while true do
                        var token = lexer.peek
-                       var last_pos = token.pos
-                       var last_line = token.line
-
-                       if token isa PError then
-                               assert token isa PError
+                       if token isa AError then
                                return new Start(null, token)
                        end
 
@@ -142,21 +137,21 @@ special ParserTable
                                var node2 = lexer.next
                                assert node2 isa EOF
                                var node1 = pop
-                               assert node1 isa PModule
+                               assert node1 isa AModule
                                var node = new Start(node1, node2)
-                               (new SearchTokensVisitor).visit(node)
+                               (new ComputeProdLocationVisitor).enter_visit(node)
                                return node
                        else if action_type == 3 then # ERROR
-                               var node2 = new PError.init_error(lexer.filename, last_line, last_pos, error_messages[errors[action_value]])
+                               var node2 = new AError.init_error("Syntax error: unexpected token.", token.location)
                                var node = new Start(null, node2)
                                return node
                        end
                end
-               return null
+               abort
        end
 
-       attr _reduce_table: Array[ReduceAction]
-       private meth build_reduce_table
+       var _reduce_table: Array[ReduceAction]
+       private fun build_reduce_table
        do
                _reduce_table = new Array[ReduceAction].with_items(
                        new ReduceAction0,
@@ -882,51 +877,156 @@ special ParserTable
                        new ReduceAction720,
                        new ReduceAction721,
                        new ReduceAction722,
-                       new ReduceAction723
+                       new ReduceAction723,
+                       new ReduceAction724,
+                       new ReduceAction725,
+                       new ReduceAction726,
+                       new ReduceAction727,
+                       new ReduceAction728,
+                       new ReduceAction729,
+                       new ReduceAction730,
+                       new ReduceAction731,
+                       new ReduceAction732,
+                       new ReduceAction733,
+                       new ReduceAction734,
+                       new ReduceAction735,
+                       new ReduceAction736,
+                       new ReduceAction737,
+                       new ReduceAction738,
+                       new ReduceAction739,
+                       new ReduceAction740,
+                       new ReduceAction741,
+                       new ReduceAction742,
+                       new ReduceAction743,
+                       new ReduceAction744,
+                       new ReduceAction745,
+                       new ReduceAction746,
+                       new ReduceAction747,
+                       new ReduceAction748,
+                       new ReduceAction749,
+                       new ReduceAction750,
+                       new ReduceAction751,
+                       new ReduceAction752,
+                       new ReduceAction753,
+                       new ReduceAction754,
+                       new ReduceAction755,
+                       new ReduceAction756,
+                       new ReduceAction757,
+                       new ReduceAction758
                )
        end
 end
 
-# Find first and last tokens of production nodes
-private class SearchTokensVisitor
+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
+
+       # Location of the last token before the end of a production
+       # So outside the production for epilon production
+       var _last_location: nullable Location
+end
+
+# Find location of production nodes
+# Uses existing token locations to infer location of productions.
+private class ComputeProdLocationVisitor
 special Visitor
-       attr _untokenned_nodes: Array[Prod]
-       attr _last_token: Token
-       redef meth visit(n: PNode)
-       do
-               if n isa Token then
-                       assert n isa Token
-                       _last_token = n
-                       for no in _untokenned_nodes do
-                               no.first_token = n
+       # 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]
+
+       # Already visited epsilon production that waits something before them
+       var _need_before_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: nullable ANode)
+       do
+               if n == null then
+                       return
+               else if n isa Token then
+                       var loc = n.location
+                       _last_location = loc
+
+                       # Add a first token to productions that need one
+                       for no in _need_first_prods do
+                               no._first_location = loc
+                       end
+                       _need_first_prods.clear
+
+                       # Find location for already visited epsilon production that need one
+                       for no in _need_after_epsilons do
+                               # Epsilon production that is in the middle of a non-epsilon production
+                               # The epsilon production has both a token before and after it
+                               var endl = loc
+                               var startl = no._last_location
+                               no.location = new Location(endl.file, startl.line_end, endl.line_start, startl.column_end, endl.column_start)
                        end
-                       _untokenned_nodes.clear
+                       _need_after_epsilons.clear
                else
                        assert n isa Prod
-                       _untokenned_nodes.add(n)
+                       _need_first_prods.add(n)
+
+                       var old_last = _last_location
+                       _last_location = null
                        n.visit_all(self)
-                       n.last_token = _last_token
+                       var endl = _last_location
+                       if endl == null then _last_location = old_last
+
+                       n._last_location = endl
+                       var startl = n._first_location
+                       if startl != null then
+                               # Non-epsilon production
+                               assert endl != null
+
+                               n.location = new Location(startl.file, startl.line_start, endl.line_end, startl.column_start, endl.column_end)
+
+                               for no in _need_before_epsilons do
+                                       # Epsilon production that starts the current non-epsilon production
+                                       #var startl = n.location
+                                       no.location = new Location(startl.file, startl.line_start, startl.line_start, startl.column_start, startl.column_start)
+                               end
+                               _need_before_epsilons.clear
+
+                               for no in _need_after_epsilons do
+                                       # Epsilon production that finishes the current non-epsilon production
+                                       #var endl = n.location
+                                       no.location = new Location(endl.file, endl.line_end, endl.line_end, endl.column_end, endl.column_end)
+                               end
+                               _need_after_epsilons.clear
+                       else
+                               # No first token means epsilon production (or "throw all my tokens" production)
+                               # So, it must be located it later
+                               if endl == null then
+                                       # Epsilon production that starts a parent non-epsilon production
+                                       _need_before_epsilons.add(n)
+                               else
+                                       # Epsilon production in the middle or that finishes a parent non-epsilon production
+                                       _need_after_epsilons.add(n)
+                               end
+                       end
                end
        end
-       init
-       do
-               _untokenned_nodes = new Array[Prod]
-       end
+
+       init do end
 end
 
 # Each reduca action has its own class, this one is the root of the hierarchy.
 private abstract class ReduceAction
-       meth action(p: Parser) is abstract
+       fun action(p: Parser) is abstract
 end
 
 private class ReduceAction0
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode4
@@ -938,15 +1038,15 @@ init do end
 end
 private class ReduceAction1
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode4
@@ -958,22 +1058,22 @@ init do end
 end
 private class ReduceAction2
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode5
@@ -985,25 +1085,25 @@ init do end
 end
 private class ReduceAction3
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode5
@@ -1015,22 +1115,22 @@ init do end
 end
 private class ReduceAction4
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode5
@@ -1042,25 +1142,25 @@ init do end
 end
 private class ReduceAction5
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode5
@@ -1072,32 +1172,32 @@ init do end
 end
 private class ReduceAction6
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode6
@@ -1109,35 +1209,35 @@ init do end
 end
 private class ReduceAction7
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pmodulenode1 = new AModule.init_amodule(
+#                                      end
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode6
@@ -1149,26 +1249,26 @@ init do end
 end
 private class ReduceAction8
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist1
-                                       assert ppropdefnode5 isa PPropdef
+                                       assert ppropdefnode5 isa nullable APropdef
                                        if ppropdefnode5 != null then
                                                listnode6.add(ppropdefnode5)
                                        end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode6
                                        )
                                        if pclassdefnode4 != null then
                                                listnode7.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode7
@@ -1180,9 +1280,9 @@ init do end
 end
 private class ReduceAction9
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
@@ -1190,26 +1290,26 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist1
-                                       assert ppropdefnode5 isa PPropdef
-                                       var listnode6 = nodearraylist3 
+                                       assert ppropdefnode5 isa nullable APropdef
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
                                        if ppropdefnode5 != null then
                                                listnode7.add(ppropdefnode5)
                                        end
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        if pclassdefnode4 != null then
                                                listnode8.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode8
@@ -1221,29 +1321,29 @@ init do end
 end
 private class ReduceAction10
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
                                        var listnode6 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist2
-                                       assert ppropdefnode5 isa PPropdef
+                                       assert ppropdefnode5 isa nullable APropdef
                                        if ppropdefnode5 != null then
                                                listnode6.add(ppropdefnode5)
                                        end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode6
                                        )
                                        if pclassdefnode4 != null then
                                                listnode7.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode7
@@ -1255,9 +1355,9 @@ init do end
 end
 private class ReduceAction11
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -1265,29 +1365,29 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist2
-                                       assert ppropdefnode5 isa PPropdef
-                                       var listnode6 = nodearraylist4 
+                                       assert ppropdefnode5 isa nullable APropdef
+                                       var listnode6 = nodearraylist4
                                        assert listnode6 isa Array[Object]
                                        if ppropdefnode5 != null then
                                                listnode7.add(ppropdefnode5)
                                        end
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        if pclassdefnode4 != null then
                                                listnode8.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode8
@@ -1299,36 +1399,36 @@ init do end
 end
 private class ReduceAction12
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode8 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        if pclassdefnode5 != null then
                                                listnode8.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode8
@@ -1340,46 +1440,46 @@ init do end
 end
 private class ReduceAction13
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode9 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist4 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist4
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode9
@@ -1391,9 +1491,9 @@ init do end
 end
 private class ReduceAction14
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -1401,29 +1501,29 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        if pclassdefnode5 != null then
                                                listnode8.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode8
@@ -1435,9 +1535,9 @@ init do end
 end
 private class ReduceAction15
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -1446,38 +1546,38 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist5 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist5
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode9
@@ -1489,36 +1589,36 @@ init do end
 end
 private class ReduceAction16
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode4
                                                else
                                                        listnode8.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode8.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode8
@@ -1530,46 +1630,46 @@ init do end
 end
 private class ReduceAction17
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode9 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist4 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist4
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode4
                                                else
                                                        listnode9.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode9
@@ -1581,9 +1681,9 @@ init do end
 end
 private class ReduceAction18
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -1591,29 +1691,29 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode4
                                                else
                                                        listnode8.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode8.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode8
@@ -1625,9 +1725,9 @@ init do end
 end
 private class ReduceAction19
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -1636,38 +1736,38 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist5 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist5
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode4
                                                else
                                                        listnode9.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode9
@@ -1679,46 +1779,46 @@ init do end
 end
 private class ReduceAction20
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode9 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist3
-                                       assert ppropdefnode7 isa PPropdef
+                                       assert ppropdefnode7 isa nullable APropdef
                                        if ppropdefnode7 != null then
                                                listnode8.add(ppropdefnode7)
                                        end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode5
                                                else
                                                        listnode9.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode9.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode9
@@ -1730,9 +1830,9 @@ init do end
 end
 private class ReduceAction21
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -1740,46 +1840,46 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist3
-                                       assert ppropdefnode7 isa PPropdef
-                                       var listnode8 = nodearraylist5 
+                                       assert ppropdefnode7 isa nullable APropdef
+                                       var listnode8 = nodearraylist5
                                        assert listnode8 isa Array[Object]
                                        if ppropdefnode7 != null then
                                                listnode9.add(ppropdefnode7)
                                        end
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode9
                                        )
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode5
                                                else
                                                        listnode10.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode10.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode10
@@ -1791,9 +1891,9 @@ init do end
 end
 private class ReduceAction22
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -1802,38 +1902,38 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist4
-                                       assert ppropdefnode7 isa PPropdef
+                                       assert ppropdefnode7 isa nullable APropdef
                                        if ppropdefnode7 != null then
                                                listnode8.add(ppropdefnode7)
                                        end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode5
                                                else
                                                        listnode9.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode9.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode9
@@ -1845,9 +1945,9 @@ init do end
 end
 private class ReduceAction23
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -1857,47 +1957,47 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist4
-                                       assert ppropdefnode7 isa PPropdef
-                                       var listnode8 = nodearraylist6 
+                                       assert ppropdefnode7 isa nullable APropdef
+                                       var listnode8 = nodearraylist6
                                        assert listnode8 isa Array[Object]
                                        if ppropdefnode7 != null then
                                                listnode9.add(ppropdefnode7)
                                        end
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode9
                                        )
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode5
                                                else
                                                        listnode10.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode10.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode10
@@ -1909,18 +2009,18 @@ init do end
 end
 private class ReduceAction24
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
                                        var pclassdefnode4 = nodearraylist1
-                                       assert pclassdefnode4 isa PClassdef
+                                       assert pclassdefnode4 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode5.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode5
@@ -1932,21 +2032,21 @@ init do end
 end
 private class ReduceAction25
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
                                        var pclassdefnode4 = nodearraylist2
-                                       assert pclassdefnode4 isa PClassdef
+                                       assert pclassdefnode4 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode5.add(pclassdefnode4)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode5
@@ -1958,28 +2058,28 @@ init do end
 end
 private class ReduceAction26
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var pclassdefnode5 = nodearraylist2
-                                       assert pclassdefnode5 isa PClassdef
+                                       assert pclassdefnode5 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode6.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode6
@@ -1991,31 +2091,31 @@ init do end
 end
 private class ReduceAction27
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var pclassdefnode5 = nodearraylist3
-                                       assert pclassdefnode5 isa PClassdef
+                                       assert pclassdefnode5 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode6.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode6
@@ -2027,28 +2127,28 @@ init do end
 end
 private class ReduceAction28
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        var pclassdefnode5 = nodearraylist2
-                                       assert pclassdefnode5 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode5 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode4
                                                else
                                                        listnode6.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode6.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode6
@@ -2060,31 +2160,31 @@ init do end
 end
 private class ReduceAction29
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode6 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var pclassdefnode5 = nodearraylist3
-                                       assert pclassdefnode5 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode5 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode4
                                                else
                                                        listnode6.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode6.add(pclassdefnode5)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode6
@@ -2096,38 +2196,38 @@ init do end
 end
 private class ReduceAction30
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        var pclassdefnode6 = nodearraylist3
-                                       assert pclassdefnode6 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode6 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode5
                                                else
                                                        listnode7.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode7.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode7
@@ -2139,9 +2239,9 @@ init do end
 end
 private class ReduceAction31
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -2149,31 +2249,31 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        var pclassdefnode6 = nodearraylist4
-                                       assert pclassdefnode6 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode6 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode5
                                                else
                                                        listnode7.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode7.add(pclassdefnode6)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode7
@@ -2185,9 +2285,9 @@ init do end
 end
 private class ReduceAction32
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
@@ -2195,22 +2295,22 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode6 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist1
-                                       assert ppropdefnode5 isa PPropdef
+                                       assert ppropdefnode5 isa nullable APropdef
                                        if ppropdefnode5 != null then
                                                listnode6.add(ppropdefnode5)
                                        end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode6
                                        )
                                        var pclassdefnode7 = nodearraylist3
-                                       assert pclassdefnode7 isa PClassdef
+                                       assert pclassdefnode7 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode8.add(pclassdefnode4)
                                        end
                                        if pclassdefnode7 != null then
                                                listnode8.add(pclassdefnode7)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode8
@@ -2222,9 +2322,9 @@ init do end
 end
 private class ReduceAction33
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -2233,31 +2333,31 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist1
-                                       assert ppropdefnode5 isa PPropdef
-                                       var listnode6 = nodearraylist3 
+                                       assert ppropdefnode5 isa nullable APropdef
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
                                        if ppropdefnode5 != null then
                                                listnode7.add(ppropdefnode5)
                                        end
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist4
-                                       assert pclassdefnode8 isa PClassdef
+                                       assert pclassdefnode8 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode9.add(pclassdefnode4)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode9
@@ -2269,9 +2369,9 @@ init do end
 end
 private class ReduceAction34
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
@@ -2279,25 +2379,25 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
                                        var listnode6 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist2
-                                       assert ppropdefnode5 isa PPropdef
+                                       assert ppropdefnode5 isa nullable APropdef
                                        if ppropdefnode5 != null then
                                                listnode6.add(ppropdefnode5)
                                        end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode6
                                        )
                                        var pclassdefnode7 = nodearraylist4
-                                       assert pclassdefnode7 isa PClassdef
+                                       assert pclassdefnode7 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode8.add(pclassdefnode4)
                                        end
                                        if pclassdefnode7 != null then
                                                listnode8.add(pclassdefnode7)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode8
@@ -2309,9 +2409,9 @@ init do end
 end
 private class ReduceAction35
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2320,34 +2420,34 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode5 = nodearraylist2
-                                       assert ppropdefnode5 isa PPropdef
-                                       var listnode6 = nodearraylist4 
+                                       assert ppropdefnode5 isa nullable APropdef
+                                       var listnode6 = nodearraylist4
                                        assert listnode6 isa Array[Object]
                                        if ppropdefnode5 != null then
                                                listnode7.add(ppropdefnode5)
                                        end
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pclassdefnode4 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode4: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist5
-                                       assert pclassdefnode8 isa PClassdef
+                                       assert pclassdefnode8 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode9.add(pclassdefnode4)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode9
@@ -2359,42 +2459,42 @@ init do end
 end
 private class ReduceAction36
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode9 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist4
-                                       assert pclassdefnode8 isa PClassdef
+                                       assert pclassdefnode8 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode9
@@ -2406,9 +2506,9 @@ init do end
 end
 private class ReduceAction37
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2416,42 +2516,42 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist4 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist4
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist5
-                                       assert pclassdefnode9 isa PClassdef
+                                       assert pclassdefnode9 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode10.add(pclassdefnode5)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode10
@@ -2463,9 +2563,9 @@ init do end
 end
 private class ReduceAction38
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2474,34 +2574,34 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist5
-                                       assert pclassdefnode8 isa PClassdef
+                                       assert pclassdefnode8 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode9
@@ -2513,9 +2613,9 @@ init do end
 end
 private class ReduceAction39
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -2525,43 +2625,43 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
+#                                      end
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist5 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist5
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist6
-                                       assert pclassdefnode9 isa PClassdef
+                                       assert pclassdefnode9 isa nullable AClassdef
                                        if pclassdefnode5 != null then
                                                listnode10.add(pclassdefnode5)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode10
@@ -2573,42 +2673,42 @@ init do end
 end
 private class ReduceAction40
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode9 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist4
-                                       assert pclassdefnode8 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode8 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode4
                                                else
                                                        listnode9.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode9
@@ -2620,9 +2720,9 @@ init do end
 end
 private class ReduceAction41
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2630,42 +2730,42 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
+                                       var listnode4 = nodearraylist1
                                        assert listnode4 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist2
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist4 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist4
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist5
-                                       assert pclassdefnode9 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode9 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode4
                                                else
                                                        listnode10.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode10.add(pclassdefnode5)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode3,
                                                listnode10
@@ -2677,9 +2777,9 @@ init do end
 end
 private class ReduceAction42
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2688,34 +2788,34 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
+                                       assert ppropdefnode6 isa nullable APropdef
                                        if ppropdefnode6 != null then
                                                listnode7.add(ppropdefnode6)
                                        end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode7
                                        )
                                        var pclassdefnode8 = nodearraylist5
-                                       assert pclassdefnode8 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode8 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode4
                                                else
                                                        listnode9.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode9.add(pclassdefnode5)
                                        end
                                        if pclassdefnode8 != null then
                                                listnode9.add(pclassdefnode8)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode9
@@ -2727,9 +2827,9 @@ init do end
 end
 private class ReduceAction43
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -2739,43 +2839,43 @@ special ReduceAction
                                        var listnode3 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode4 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode6 = nodearraylist3
-                                       assert ppropdefnode6 isa PPropdef
-                                       var listnode7 = nodearraylist5 
+                                       assert ppropdefnode6 isa nullable APropdef
+                                       var listnode7 = nodearraylist5
                                        assert listnode7 isa Array[Object]
                                        if ppropdefnode6 != null then
                                                listnode8.add(ppropdefnode6)
                                        end
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode5 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode5: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist6
-                                       assert pclassdefnode9 isa PClassdef
-                                       if listnode4 != null then
+                                       assert pclassdefnode9 isa nullable AClassdef
+#                                      if listnode4 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode4
                                                else
                                                        listnode10.append(listnode4)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode5 != null then
                                                listnode10.add(pclassdefnode5)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode3,
                                                listnode10
@@ -2787,9 +2887,9 @@ init do end
 end
 private class ReduceAction44
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -2797,42 +2897,42 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist3
-                                       assert ppropdefnode7 isa PPropdef
+                                       assert ppropdefnode7 isa nullable APropdef
                                        if ppropdefnode7 != null then
                                                listnode8.add(ppropdefnode7)
                                        end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist5
-                                       assert pclassdefnode9 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode9 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode5
                                                else
                                                        listnode10.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode10.add(pclassdefnode6)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode10
@@ -2844,9 +2944,9 @@ init do end
 end
 private class ReduceAction45
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -2855,51 +2955,51 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode11 = new Array[Object]
-                                       var listnode3 = nodearraylist1 
+                                       var listnode3 = nodearraylist1
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist2 
+#                                      end
+                                       var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist3
-                                       assert ppropdefnode7 isa PPropdef
-                                       var listnode8 = nodearraylist5 
+                                       assert ppropdefnode7 isa nullable APropdef
+                                       var listnode8 = nodearraylist5
                                        assert listnode8 isa Array[Object]
                                        if ppropdefnode7 != null then
                                                listnode9.add(ppropdefnode7)
                                        end
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode9
                                        )
                                        var pclassdefnode10 = nodearraylist6
-                                       assert pclassdefnode10 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode10 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode11.is_empty then
                                                        listnode11 = listnode5
                                                else
                                                        listnode11.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode11.add(pclassdefnode6)
                                        end
                                        if pclassdefnode10 != null then
                                                listnode11.add(pclassdefnode10)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                null,
                                                listnode4,
                                                listnode11
@@ -2911,9 +3011,9 @@ init do end
 end
 private class ReduceAction46
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -2923,43 +3023,43 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        var listnode8 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist4
-                                       assert ppropdefnode7 isa PPropdef
+                                       assert ppropdefnode7 isa nullable APropdef
                                        if ppropdefnode7 != null then
                                                listnode8.add(ppropdefnode7)
                                        end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode8
                                        )
                                        var pclassdefnode9 = nodearraylist6
-                                       assert pclassdefnode9 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode9 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode5
                                                else
                                                        listnode10.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode10.add(pclassdefnode6)
                                        end
                                        if pclassdefnode9 != null then
                                                listnode10.add(pclassdefnode9)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode10
@@ -2971,9 +3071,9 @@ init do end
 end
 private class ReduceAction47
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -2984,52 +3084,52 @@ special ReduceAction
                                        var listnode4 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa PPackagedecl
-                                       var listnode3 = nodearraylist2 
+                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        var listnode9 = new Array[Object]
                                        var ppropdefnode7 = nodearraylist4
-                                       assert ppropdefnode7 isa PPropdef
-                                       var listnode8 = nodearraylist6 
+                                       assert ppropdefnode7 isa nullable APropdef
+                                       var listnode8 = nodearraylist6
                                        assert listnode8 isa Array[Object]
                                        if ppropdefnode7 != null then
                                                listnode9.add(ppropdefnode7)
                                        end
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode6 = new ATopClassdef.init_atopclassdef(
+#                                      end
+                                       var pclassdefnode6: nullable ATopClassdef = new ATopClassdef.init_atopclassdef(
                                                listnode9
                                        )
                                        var pclassdefnode10 = nodearraylist7
-                                       assert pclassdefnode10 isa PClassdef
-                                       if listnode5 != null then
+                                       assert pclassdefnode10 isa nullable AClassdef
+#                                      if listnode5 != null then
                                                if listnode11.is_empty then
                                                        listnode11 = listnode5
                                                else
                                                        listnode11.append(listnode5)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode6 != null then
                                                listnode11.add(pclassdefnode6)
                                        end
                                        if pclassdefnode10 != null then
                                                listnode11.add(pclassdefnode10)
                                        end
-                                       var pmodulenode1 = new AModule.init_amodule(
+                                       var pmodulenode1: nullable AModule = new AModule.init_amodule(
                                                ppackagedeclnode2,
                                                listnode4,
                                                listnode11
@@ -3041,21 +3141,21 @@ init do end
 end
 private class ReduceAction48
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwpackagenode3 = nodearraylist2
-                                       assert tkwpackagenode3 isa TKwpackage
+                                       assert tkwpackagenode3 isa nullable TKwpackage
                                        var tidnode4 = nodearraylist4
-                                       assert tidnode4 isa TId
-                                       var ppackagedeclnode1 = new APackagedecl.init_apackagedecl(
+                                       assert tidnode4 isa nullable TId
+                                       var ppackagedeclnode1: nullable APackagedecl = new APackagedecl.init_apackagedecl(
                                                pdocnode2,
                                                tkwpackagenode3,
                                                tidnode4
@@ -3067,9 +3167,9 @@ init do end
 end
 private class ReduceAction49
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -3077,12 +3177,12 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pvisibilitynode2 = nodearraylist2
-                                       assert pvisibilitynode2 isa PVisibility
+                                       assert pvisibilitynode2 isa nullable AVisibility
                                        var tkwimportnode3 = nodearraylist3
-                                       assert tkwimportnode3 isa TKwimport
+                                       assert tkwimportnode3 isa nullable TKwimport
                                        var tidnode4 = nodearraylist5
-                                       assert tidnode4 isa TId
-                                       var pimportnode1 = new AImport.init_aimport(
+                                       assert tidnode4 isa nullable TId
+                                       var pimportnode1: nullable AStdImport = new AStdImport.init_astdimport(
                                                pvisibilitynode2,
                                                tkwimportnode3,
                                                tidnode4
@@ -3094,9 +3194,9 @@ init do end
 end
 private class ReduceAction50
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -3104,12 +3204,12 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pvisibilitynode2 = nodearraylist2
-                                       assert pvisibilitynode2 isa PVisibility
+                                       assert pvisibilitynode2 isa nullable AVisibility
                                        var tkwimportnode3 = nodearraylist3
-                                       assert tkwimportnode3 isa TKwimport
+                                       assert tkwimportnode3 isa nullable TKwimport
                                        var tkwendnode4 = nodearraylist5
-                                       assert tkwendnode4 isa TKwend
-                                       var pimportnode1 = new ANoImport.init_anoimport(
+                                       assert tkwendnode4 isa nullable TKwend
+                                       var pimportnode1: nullable ANoImport = new ANoImport.init_anoimport(
                                                pvisibilitynode2,
                                                tkwimportnode3,
                                                tkwendnode4
@@ -3121,17 +3221,17 @@ init do end
 end
 private class ReduceAction51
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var ppropdefnode2 = nodearraylist1
-                                       assert ppropdefnode2 isa PPropdef
+                                       assert ppropdefnode2 isa nullable APropdef
                                        if ppropdefnode2 != null then
                                                listnode3.add(ppropdefnode2)
                                        end
-                                       var pclassdefnode1 = new AMainClassdef.init_amainclassdef(
+                                       var pclassdefnode1: nullable AMainClassdef = new AMainClassdef.init_amainclassdef(
                                                listnode3
                                        )
                                        node_list = pclassdefnode1
@@ -3141,9 +3241,9 @@ init do end
 end
 private class ReduceAction52
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        node_list = null
                                        p.push(p.go_to(3), node_list)
@@ -3152,22 +3252,22 @@ init do end
 end
 private class ReduceAction53
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa PExpr
+                                       assert pexprnode4 isa nullable AExpr
                                        if pexprnode4 != null then
                                                listnode5.add(pexprnode4)
                                        end
-                                       var pexprnode3 = new ABlockExpr.init_ablockexpr(
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode5
                                        )
-                                       var ppropdefnode1 = new AMainMethPropdef.init_amainmethpropdef(
+                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
                                                null,
                                                pexprnode3
                                        )
@@ -3178,32 +3278,32 @@ init do end
 end
 private class ReduceAction54
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa PExpr
-                                       var listnode5 = nodearraylist3 
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
                                        if pexprnode4 != null then
                                                listnode6.add(pexprnode4)
                                        end
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode3 = new ABlockExpr.init_ablockexpr(
+#                                      end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode6
                                        )
-                                       var ppropdefnode1 = new AMainMethPropdef.init_amainmethpropdef(
+                                       var ppropdefnode1: nullable AMainMethPropdef = new AMainMethPropdef.init_amainmethpropdef(
                                                null,
                                                pexprnode3
                                        )
@@ -3214,9 +3314,9 @@ init do end
 end
 private class ReduceAction55
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -3228,14 +3328,14 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3252,9 +3352,9 @@ init do end
 end
 private class ReduceAction56
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -3267,16 +3367,16 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode9 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3293,9 +3393,9 @@ init do end
 end
 private class ReduceAction57
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -3308,23 +3408,23 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3341,9 +3441,9 @@ init do end
 end
 private class ReduceAction58
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -3357,25 +3457,25 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3392,9 +3492,9 @@ init do end
 end
 private class ReduceAction59
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -3407,23 +3507,23 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist6
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3440,9 +3540,9 @@ init do end
 end
 private class ReduceAction60
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -3456,25 +3556,25 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist7
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3491,9 +3591,9 @@ init do end
 end
 private class ReduceAction61
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -3507,32 +3607,32 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist7 
+#                                      end
+                                       var listnode9 = nodearraylist7
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3549,9 +3649,9 @@ init do end
 end
 private class ReduceAction62
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -3566,34 +3666,34 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist8 
+#                                      end
+                                       var listnode9 = nodearraylist8
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3610,9 +3710,9 @@ init do end
 end
 private class ReduceAction63
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -3626,19 +3726,19 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
+                                       assert tclassidnode6 isa nullable TClassid
                                        var ppropdefnode9 = nodearraylist6
-                                       assert ppropdefnode9 isa PPropdef
+                                       assert ppropdefnode9 isa nullable APropdef
                                        if ppropdefnode9 != null then
                                                listnode10.add(ppropdefnode9)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3655,9 +3755,9 @@ init do end
 end
 private class ReduceAction64
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -3672,28 +3772,28 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
+                                       assert tclassidnode6 isa nullable TClassid
                                        var ppropdefnode9 = nodearraylist6
-                                       assert ppropdefnode9 isa PPropdef
-                                       var listnode10 = nodearraylist8 
+                                       assert ppropdefnode9 isa nullable APropdef
+                                       var listnode10 = nodearraylist8
                                        assert listnode10 isa Array[Object]
                                        if ppropdefnode9 != null then
                                                listnode11.add(ppropdefnode9)
                                        end
-                                       if listnode10 != null then
+#                                      if listnode10 != null then
                                                if listnode11.is_empty then
                                                        listnode11 = listnode10
                                                else
                                                        listnode11.append(listnode10)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3710,9 +3810,9 @@ init do end
 end
 private class ReduceAction65
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -3727,21 +3827,21 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode10 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
+                                       assert tclassidnode6 isa nullable TClassid
                                        var ppropdefnode9 = nodearraylist7
-                                       assert ppropdefnode9 isa PPropdef
+                                       assert ppropdefnode9 isa nullable APropdef
                                        if ppropdefnode9 != null then
                                                listnode10.add(ppropdefnode9)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3758,9 +3858,9 @@ init do end
 end
 private class ReduceAction66
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -3776,30 +3876,30 @@ special ReduceAction
                                        var listnode8 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
+                                       assert tclassidnode6 isa nullable TClassid
                                        var ppropdefnode9 = nodearraylist7
-                                       assert ppropdefnode9 isa PPropdef
-                                       var listnode10 = nodearraylist9 
+                                       assert ppropdefnode9 isa nullable APropdef
+                                       var listnode10 = nodearraylist9
                                        assert listnode10 isa Array[Object]
                                        if ppropdefnode9 != null then
                                                listnode11.add(ppropdefnode9)
                                        end
-                                       if listnode10 != null then
+#                                      if listnode10 != null then
                                                if listnode11.is_empty then
                                                        listnode11 = listnode10
                                                else
                                                        listnode11.append(listnode10)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3816,9 +3916,9 @@ init do end
 end
 private class ReduceAction67
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -3833,28 +3933,28 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist7
-                                       assert ppropdefnode10 isa PPropdef
+                                       assert ppropdefnode10 isa nullable APropdef
                                        if ppropdefnode10 != null then
                                                listnode11.add(ppropdefnode10)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3871,9 +3971,9 @@ init do end
 end
 private class ReduceAction68
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -3889,37 +3989,37 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist7
-                                       assert ppropdefnode10 isa PPropdef
-                                       var listnode11 = nodearraylist9 
+                                       assert ppropdefnode10 isa nullable APropdef
+                                       var listnode11 = nodearraylist9
                                        assert listnode11 isa Array[Object]
                                        if ppropdefnode10 != null then
                                                listnode12.add(ppropdefnode10)
                                        end
-                                       if listnode11 != null then
+#                                      if listnode11 != null then
                                                if listnode12.is_empty then
                                                        listnode12 = listnode11
                                                else
                                                        listnode12.append(listnode11)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -3936,9 +4036,9 @@ init do end
 end
 private class ReduceAction69
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -3954,30 +4054,30 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist8
-                                       assert ppropdefnode10 isa PPropdef
+                                       assert ppropdefnode10 isa nullable APropdef
                                        if ppropdefnode10 != null then
                                                listnode11.add(ppropdefnode10)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -3994,9 +4094,9 @@ init do end
 end
 private class ReduceAction70
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -4013,39 +4113,39 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist8
-                                       assert ppropdefnode10 isa PPropdef
-                                       var listnode11 = nodearraylist10 
+                                       assert ppropdefnode10 isa nullable APropdef
+                                       var listnode11 = nodearraylist10
                                        assert listnode11 isa Array[Object]
                                        if ppropdefnode10 != null then
                                                listnode12.add(ppropdefnode10)
                                        end
-                                       if listnode11 != null then
+#                                      if listnode11 != null then
                                                if listnode12.is_empty then
                                                        listnode12 = listnode11
                                                else
                                                        listnode12.append(listnode11)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4062,9 +4162,9 @@ init do end
 end
 private class ReduceAction71
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -4079,28 +4179,28 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist6
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist7
-                                       assert ppropdefnode10 isa PPropdef
+                                       assert ppropdefnode10 isa nullable APropdef
                                        if ppropdefnode10 != null then
                                                listnode11.add(ppropdefnode10)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4117,9 +4217,9 @@ init do end
 end
 private class ReduceAction72
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -4135,37 +4235,37 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist6
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist7
-                                       assert ppropdefnode10 isa PPropdef
-                                       var listnode11 = nodearraylist9 
+                                       assert ppropdefnode10 isa nullable APropdef
+                                       var listnode11 = nodearraylist9
                                        assert listnode11 isa Array[Object]
                                        if ppropdefnode10 != null then
                                                listnode12.add(ppropdefnode10)
                                        end
-                                       if listnode11 != null then
+#                                      if listnode11 != null then
                                                if listnode12.is_empty then
                                                        listnode12 = listnode11
                                                else
                                                        listnode12.append(listnode11)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4182,9 +4282,9 @@ init do end
 end
 private class ReduceAction73
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -4200,30 +4300,30 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode11 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist7
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist8
-                                       assert ppropdefnode10 isa PPropdef
+                                       assert ppropdefnode10 isa nullable APropdef
                                        if ppropdefnode10 != null then
                                                listnode11.add(ppropdefnode10)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4240,9 +4340,9 @@ init do end
 end
 private class ReduceAction74
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -4259,39 +4359,39 @@ special ReduceAction
                                        var listnode9 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode8 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode8 = nodearraylist7
                                        assert listnode8 isa Array[Object]
-                                       if listnode8 != null then
+#                                      if listnode8 != null then
                                                if listnode9.is_empty then
                                                        listnode9 = listnode8
                                                else
                                                        listnode9.append(listnode8)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode10 = nodearraylist8
-                                       assert ppropdefnode10 isa PPropdef
-                                       var listnode11 = nodearraylist10 
+                                       assert ppropdefnode10 isa nullable APropdef
+                                       var listnode11 = nodearraylist10
                                        assert listnode11 isa Array[Object]
                                        if ppropdefnode10 != null then
                                                listnode12.add(ppropdefnode10)
                                        end
-                                       if listnode11 != null then
+#                                      if listnode11 != null then
                                                if listnode12.is_empty then
                                                        listnode12 = listnode11
                                                else
                                                        listnode12.append(listnode11)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4308,9 +4408,9 @@ init do end
 end
 private class ReduceAction75
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -4326,37 +4426,37 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist7 
+#                                      end
+                                       var listnode9 = nodearraylist7
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode11 = nodearraylist8
-                                       assert ppropdefnode11 isa PPropdef
+                                       assert ppropdefnode11 isa nullable APropdef
                                        if ppropdefnode11 != null then
                                                listnode12.add(ppropdefnode11)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4373,9 +4473,9 @@ init do end
 end
 private class ReduceAction76
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -4392,46 +4492,46 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist3
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist6 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist6
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist7 
+#                                      end
+                                       var listnode9 = nodearraylist7
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode11 = nodearraylist8
-                                       assert ppropdefnode11 isa PPropdef
-                                       var listnode12 = nodearraylist10 
+                                       assert ppropdefnode11 isa nullable APropdef
+                                       var listnode12 = nodearraylist10
                                        assert listnode12 isa Array[Object]
                                        if ppropdefnode11 != null then
                                                listnode13.add(ppropdefnode11)
                                        end
-                                       if listnode12 != null then
+#                                      if listnode12 != null then
                                                if listnode13.is_empty then
                                                        listnode13 = listnode12
                                                else
                                                        listnode13.append(listnode12)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4448,9 +4548,9 @@ init do end
 end
 private class ReduceAction77
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -4467,39 +4567,39 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist8 
+#                                      end
+                                       var listnode9 = nodearraylist8
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode11 = nodearraylist9
-                                       assert ppropdefnode11 isa PPropdef
+                                       assert ppropdefnode11 isa nullable APropdef
                                        if ppropdefnode11 != null then
                                                listnode12.add(ppropdefnode11)
                                        end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4516,9 +4616,9 @@ init do end
 end
 private class ReduceAction78
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
@@ -4536,48 +4636,48 @@ special ReduceAction
                                        var listnode10 = new Array[Object]
                                        var listnode13 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var pclasskindnode5 = nodearraylist4
-                                       assert pclasskindnode5 isa PClasskind
+                                       assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
-                                       assert tclassidnode6 isa TClassid
-                                       var listnode7 = nodearraylist7 
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var listnode7 = nodearraylist7
                                        assert listnode7 isa Array[Object]
-                                       if listnode7 != null then
+#                                      if listnode7 != null then
                                                if listnode8.is_empty then
                                                        listnode8 = listnode7
                                                else
                                                        listnode8.append(listnode7)
                                                end
-                                       end
-                                       var listnode9 = nodearraylist8 
+#                                      end
+                                       var listnode9 = nodearraylist8
                                        assert listnode9 isa Array[Object]
-                                       if listnode9 != null then
+#                                      if listnode9 != null then
                                                if listnode10.is_empty then
                                                        listnode10 = listnode9
                                                else
                                                        listnode10.append(listnode9)
                                                end
-                                       end
+#                                      end
                                        var ppropdefnode11 = nodearraylist9
-                                       assert ppropdefnode11 isa PPropdef
-                                       var listnode12 = nodearraylist11 
+                                       assert ppropdefnode11 isa nullable APropdef
+                                       var listnode12 = nodearraylist11
                                        assert listnode12 isa Array[Object]
                                        if ppropdefnode11 != null then
                                                listnode13.add(ppropdefnode11)
                                        end
-                                       if listnode12 != null then
+#                                      if listnode12 != null then
                                                if listnode13.is_empty then
                                                        listnode13 = listnode12
                                                else
                                                        listnode13.append(listnode12)
                                                end
-                                       end
-                                       var pclassdefnode1 = new AClassdef.init_aclassdef(
+#                                      end
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4594,13 +4694,13 @@ init do end
 end
 private class ReduceAction79
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwclassnode2 = nodearraylist1
-                                       assert tkwclassnode2 isa TKwclass
-                                       var pclasskindnode1 = new AConcreteClasskind.init_aconcreteclasskind(
+                                       assert tkwclassnode2 isa nullable TKwclass
+                                       var pclasskindnode1: nullable AConcreteClasskind = new AConcreteClasskind.init_aconcreteclasskind(
                                                tkwclassnode2
                                        )
                                        node_list = pclasskindnode1
@@ -4610,16 +4710,16 @@ init do end
 end
 private class ReduceAction80
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwabstractnode2 = nodearraylist1
-                                       assert tkwabstractnode2 isa TKwabstract
+                                       assert tkwabstractnode2 isa nullable TKwabstract
                                        var tkwclassnode3 = nodearraylist2
-                                       assert tkwclassnode3 isa TKwclass
-                                       var pclasskindnode1 = new AAbstractClasskind.init_aabstractclasskind(
+                                       assert tkwclassnode3 isa nullable TKwclass
+                                       var pclasskindnode1: nullable AAbstractClasskind = new AAbstractClasskind.init_aabstractclasskind(
                                                tkwabstractnode2,
                                                tkwclassnode3
                                        )
@@ -4630,13 +4730,13 @@ init do end
 end
 private class ReduceAction81
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwinterfacenode2 = nodearraylist1
-                                       assert tkwinterfacenode2 isa TKwinterface
-                                       var pclasskindnode1 = new AInterfaceClasskind.init_ainterfaceclasskind(
+                                       assert tkwinterfacenode2 isa nullable TKwinterface
+                                       var pclasskindnode1: nullable AInterfaceClasskind = new AInterfaceClasskind.init_ainterfaceclasskind(
                                                tkwinterfacenode2
                                        )
                                        node_list = pclasskindnode1
@@ -4646,13 +4746,13 @@ init do end
 end
 private class ReduceAction82
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwuniversalnode2 = nodearraylist1
-                                       assert tkwuniversalnode2 isa TKwuniversal
-                                       var pclasskindnode1 = new AUniversalClasskind.init_auniversalclasskind(
+                                       assert tkwuniversalnode2 isa nullable TKwuniversal
+                                       var pclasskindnode1: nullable AUniversalClasskind = new AUniversalClasskind.init_auniversalclasskind(
                                                tkwuniversalnode2
                                        )
                                        node_list = pclasskindnode1
@@ -4662,9 +4762,9 @@ init do end
 end
 private class ReduceAction83
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -4672,7 +4772,7 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pformaldefnode1 = nodearraylist3
-                                       assert pformaldefnode1 isa PFormaldef
+                                       assert pformaldefnode1 isa nullable AFormaldef
                                        if pformaldefnode1 != null then
                                                listnode2.add(pformaldefnode1)
                                        end
@@ -4683,9 +4783,9 @@ init do end
 end
 private class ReduceAction84
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -4694,19 +4794,19 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var pformaldefnode1 = nodearraylist3
-                                       assert pformaldefnode1 isa PFormaldef
-                                       var listnode2 = nodearraylist4 
+                                       assert pformaldefnode1 isa nullable AFormaldef
+                                       var listnode2 = nodearraylist4
                                        assert listnode2 isa Array[Object]
                                        if pformaldefnode1 != null then
                                                listnode3.add(pformaldefnode1)
                                        end
-                                       if listnode2 != null then
+#                                      if listnode2 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode2
                                                else
                                                        listnode3.append(listnode2)
                                                end
-                                       end
+#                                      end
                                        node_list = listnode3
                                        p.push(p.go_to(7), node_list)
        end
@@ -4714,14 +4814,14 @@ init do end
 end
 private class ReduceAction85
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pformaldefnode1 = nodearraylist3
-                                       assert pformaldefnode1 isa PFormaldef
+                                       assert pformaldefnode1 isa nullable AFormaldef
                                        node_list = pformaldefnode1
                                        p.push(p.go_to(8), node_list)
        end
@@ -4729,13 +4829,13 @@ init do end
 end
 private class ReduceAction86
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa TClassid
-                                       var pformaldefnode1 = new AFormaldef.init_aformaldef(
+                                       assert tclassidnode2 isa nullable TClassid
+                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
                                                tclassidnode2,
                                                null
                                        )
@@ -4746,16 +4846,16 @@ init do end
 end
 private class ReduceAction87
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa TClassid
+                                       assert tclassidnode2 isa nullable TClassid
                                        var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa PType
-                                       var pformaldefnode1 = new AFormaldef.init_aformaldef(
+                                       assert ptypenode3 isa nullable AType
+                                       var pformaldefnode1: nullable AFormaldef = new AFormaldef.init_aformaldef(
                                                tclassidnode2,
                                                ptypenode3
                                        )
@@ -4766,18 +4866,18 @@ init do end
 end
 private class ReduceAction88
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwspecialnode2 = nodearraylist2
-                                       assert tkwspecialnode2 isa TKwspecial
+                                       assert tkwspecialnode2 isa nullable TKwspecial
                                        var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa PType
-                                       var psuperclassnode1 = new ASuperclass.init_asuperclass(
+                                       assert ptypenode3 isa nullable AType
+                                       var psuperclassnode1: nullable ASuperclass = new ASuperclass.init_asuperclass(
                                                tkwspecialnode2,
                                                ptypenode3
                                        )
@@ -4788,13 +4888,13 @@ init do end
 end
 private class ReduceAction89
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var ppropdefnode1 = nodearraylist1
-                                       assert ppropdefnode1 isa PPropdef
+                                       assert ppropdefnode1 isa nullable APropdef
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(11), node_list)
        end
@@ -4802,9 +4902,9 @@ init do end
 end
 private class ReduceAction90
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -4813,18 +4913,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4840,9 +4940,9 @@ init do end
 end
 private class ReduceAction91
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4852,20 +4952,20 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4881,9 +4981,9 @@ init do end
 end
 private class ReduceAction92
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -4893,18 +4993,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4920,9 +5020,9 @@ init do end
 end
 private class ReduceAction93
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -4933,20 +5033,20 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -4962,9 +5062,9 @@ init do end
 end
 private class ReduceAction94
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -4973,16 +5073,16 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -4997,9 +5097,9 @@ init do end
 end
 private class ReduceAction95
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5009,18 +5109,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new ADeferredMethPropdef.init_adeferredmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable ADeferredMethPropdef = new ADeferredMethPropdef.init_adeferredmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -5035,9 +5135,9 @@ init do end
 end
 private class ReduceAction96
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5046,16 +5146,16 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AInternMethPropdef.init_ainternmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AInternMethPropdef = new AInternMethPropdef.init_ainternmethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -5070,9 +5170,9 @@ init do end
 end
 private class ReduceAction97
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5082,18 +5182,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AInternMethPropdef.init_ainternmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AInternMethPropdef = new AInternMethPropdef.init_ainternmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -5108,9 +5208,9 @@ init do end
 end
 private class ReduceAction98
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5119,16 +5219,16 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -5144,9 +5244,9 @@ init do end
 end
 private class ReduceAction99
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5156,18 +5256,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -5183,9 +5283,9 @@ init do end
 end
 private class ReduceAction100
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5195,18 +5295,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa TString
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
+                                       assert tstringnode8 isa nullable TString
+                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                null,
                                                pvisibilitynode4,
@@ -5222,9 +5322,9 @@ init do end
 end
 private class ReduceAction101
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -5235,20 +5335,20 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
+                                       assert tkwredefnode3 isa nullable TKwredef
                                        var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
+                                       assert pvisibilitynode4 isa nullable AVisibility
                                        var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
+                                       assert tkwmethnode5 isa nullable TKwmeth
                                        var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
+                                       assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
+                                       assert psignaturenode7 isa nullable ASignature
                                        var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa TString
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
+                                       assert tstringnode8 isa nullable TString
+                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
@@ -5264,9 +5364,9 @@ init do end
 end
 private class ReduceAction102
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -5274,34 +5374,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist5
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist5
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist6
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5312,9 +5411,9 @@ init do end
 end
 private class ReduceAction103
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5323,36 +5422,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5363,37 +5461,36 @@ init do end
 end
 private class ReduceAction104
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5404,9 +5501,9 @@ init do end
 end
 private class ReduceAction105
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5415,36 +5512,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5455,9 +5551,9 @@ init do end
 end
 private class ReduceAction106
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5467,38 +5563,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5509,9 +5604,9 @@ init do end
 end
 private class ReduceAction107
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -5519,30 +5614,29 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5553,37 +5647,36 @@ init do end
 end
 private class ReduceAction108
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5594,9 +5687,9 @@ init do end
 end
 private class ReduceAction109
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -5604,30 +5697,29 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5638,30 +5730,29 @@ init do end
 end
 private class ReduceAction110
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist3
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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(
                                                pdocnode2,
                                                null,
                                                null,
                                                null,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
+                                               tkwvarnode7,
+                                               tattridnode8,
                                                null,
                                                null
                                        )
@@ -5672,9 +5763,9 @@ init do end
 end
 private class ReduceAction111
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5683,36 +5774,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5723,9 +5813,9 @@ init do end
 end
 private class ReduceAction112
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5735,38 +5825,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5777,9 +5866,9 @@ init do end
 end
 private class ReduceAction113
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -5787,30 +5876,29 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5821,9 +5909,9 @@ init do end
 end
 private class ReduceAction114
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -5833,38 +5921,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5875,9 +5962,9 @@ init do end
 end
 private class ReduceAction115
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -5888,40 +5975,39 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist8
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist8
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist9
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
                                                null
                                        )
@@ -5932,9 +6018,9 @@ init do end
 end
 private class ReduceAction116
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -5943,32 +6029,31 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -5979,9 +6064,9 @@ init do end
 end
 private class ReduceAction117
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -5989,30 +6074,29 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -6023,9 +6107,9 @@ init do end
 end
 private class ReduceAction118
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6034,32 +6118,31 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
                                                null
                                        )
@@ -6070,33 +6153,32 @@ init do end
 end
 private class ReduceAction119
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist4
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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(
                                                pdocnode2,
                                                null,
                                                null,
                                                tkwredefnode5,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
+                                               tkwvarnode7,
+                                               tattridnode8,
                                                null,
                                                null
                                        )
@@ -6107,9 +6189,9 @@ init do end
 end
 private class ReduceAction120
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6118,37 +6200,36 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist5
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist7
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist5
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist6
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist7
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6158,9 +6239,9 @@ init do end
 end
 private class ReduceAction121
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6170,39 +6251,38 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6212,9 +6292,9 @@ init do end
 end
 private class ReduceAction122
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -6222,31 +6302,30 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist6
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6256,9 +6335,9 @@ init do end
 end
 private class ReduceAction123
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6268,39 +6347,38 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6310,9 +6388,9 @@ init do end
 end
 private class ReduceAction124
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6323,41 +6401,40 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6367,9 +6444,9 @@ init do end
 end
 private class ReduceAction125
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6378,33 +6455,32 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6414,9 +6490,9 @@ init do end
 end
 private class ReduceAction126
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -6424,31 +6500,30 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist6
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6458,9 +6533,9 @@ init do end
 end
 private class ReduceAction127
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6469,33 +6544,32 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6505,34 +6579,33 @@ init do end
 end
 private class ReduceAction128
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist3
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist4
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode9 = nodearraylist5
+                                       assert ptypenode9 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                null,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
-                                               ptypenode10,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               ptypenode9,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6542,9 +6615,9 @@ init do end
 end
 private class ReduceAction129
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6554,39 +6627,38 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6596,9 +6668,9 @@ init do end
 end
 private class ReduceAction130
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6609,41 +6681,40 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6653,9 +6724,9 @@ init do end
 end
 private class ReduceAction131
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6664,33 +6735,32 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6700,9 +6770,9 @@ init do end
 end
 private class ReduceAction132
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -6713,41 +6783,40 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6757,9 +6826,9 @@ init do end
 end
 private class ReduceAction133
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -6771,43 +6840,42 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist8
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist10
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist8
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist9
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist10
+                                       assert ptypenode13 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6817,9 +6885,9 @@ init do end
 end
 private class ReduceAction134
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6829,35 +6897,34 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist8
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6867,9 +6934,9 @@ init do end
 end
 private class ReduceAction135
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6878,33 +6945,32 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6914,9 +6980,9 @@ init do end
 end
 private class ReduceAction136
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6926,35 +6992,34 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist8
+                                       assert ptypenode11 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -6964,9 +7029,9 @@ init do end
 end
 private class ReduceAction137
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -6974,27 +7039,26 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist4
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode9 = nodearraylist6
+                                       assert ptypenode9 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                tkwredefnode5,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
-                                               ptypenode10,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               ptypenode9,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -7004,9 +7068,9 @@ init do end
 end
 private class ReduceAction138
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7017,38 +7081,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist5
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist9
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist5
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist6
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7057,9 +7120,9 @@ init do end
 end
 private class ReduceAction139
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7071,40 +7134,39 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist10
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7113,9 +7175,9 @@ init do end
 end
 private class ReduceAction140
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7125,32 +7187,31 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7159,9 +7220,9 @@ init do end
 end
 private class ReduceAction141
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7173,40 +7234,39 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist10
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7215,9 +7275,9 @@ init do end
 end
 private class ReduceAction142
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -7230,42 +7290,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7274,9 +7333,9 @@ init do end
 end
 private class ReduceAction143
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7287,34 +7346,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7323,9 +7381,9 @@ init do end
 end
 private class ReduceAction144
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7335,32 +7393,31 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7369,9 +7426,9 @@ init do end
 end
 private class ReduceAction145
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7382,34 +7439,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7418,9 +7474,9 @@ init do end
 end
 private class ReduceAction146
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -7429,26 +7485,25 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist3
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var pexprnode11 = nodearraylist7
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist4
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var pexprnode10 = nodearraylist7
+                                       assert pexprnode10 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                null,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
+                                               tkwvarnode7,
+                                               tattridnode8,
                                                null,
-                                               tattridnode9,
-                                               null,
-                                               pexprnode11
+                                               pexprnode10
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7457,9 +7512,9 @@ init do end
 end
 private class ReduceAction147
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7471,40 +7526,39 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist10
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7513,9 +7567,9 @@ init do end
 end
 private class ReduceAction148
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -7528,42 +7582,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7572,9 +7625,9 @@ init do end
 end
 private class ReduceAction149
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7585,34 +7638,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7621,9 +7673,9 @@ init do end
 end
 private class ReduceAction150
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -7636,42 +7688,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7680,9 +7731,9 @@ init do end
 end
 private class ReduceAction151
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -7696,44 +7747,43 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist8
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist8
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist9
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var pexprnode14 = nodearraylist12
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
+                                               tkwvarnode11,
+                                               tattridnode12,
                                                null,
-                                               pexprnode15
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7742,9 +7792,9 @@ init do end
 end
 private class ReduceAction152
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7756,36 +7806,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7794,9 +7843,9 @@ init do end
 end
 private class ReduceAction153
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -7807,34 +7856,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7843,9 +7891,9 @@ init do end
 end
 private class ReduceAction154
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7857,36 +7905,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
+                                               tkwvarnode9,
+                                               tattridnode10,
                                                null,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7895,9 +7942,9 @@ init do end
 end
 private class ReduceAction155
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -7907,28 +7954,27 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist4
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var pexprnode11 = nodearraylist8
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                tkwredefnode5,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
+                                               tkwvarnode7,
+                                               tattridnode8,
                                                null,
-                                               pexprnode11
+                                               pexprnode10
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7937,9 +7983,9 @@ init do end
 end
 private class ReduceAction156
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -7951,40 +7997,39 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist5
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist7
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist5
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist6
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist7
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist10
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -7993,9 +8038,9 @@ init do end
 end
 private class ReduceAction157
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -8008,42 +8053,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8052,9 +8096,9 @@ init do end
 end
 private class ReduceAction158
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -8065,34 +8109,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist6
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8101,9 +8144,9 @@ init do end
 end
 private class ReduceAction159
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -8116,42 +8159,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8160,9 +8202,9 @@ init do end
 end
 private class ReduceAction160
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -8176,44 +8218,43 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist12
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                null,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8222,9 +8263,9 @@ init do end
 end
 private class ReduceAction161
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -8236,36 +8277,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8274,9 +8314,9 @@ init do end
 end
 private class ReduceAction162
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -8287,34 +8327,33 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist4
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist4
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist5
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist6
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8323,9 +8362,9 @@ init do end
 end
 private class ReduceAction163
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -8337,36 +8376,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8375,9 +8413,9 @@ init do end
 end
 private class ReduceAction164
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -8387,28 +8425,27 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist3
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa PType
-                                       var pexprnode11 = nodearraylist8
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist4
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode9 = nodearraylist5
+                                       assert ptypenode9 isa nullable AType
+                                       var pexprnode10 = nodearraylist8
+                                       assert pexprnode10 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                null,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               pexprnode11
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               ptypenode9,
+                                               pexprnode10
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8417,9 +8454,9 @@ init do end
 end
 private class ReduceAction165
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -8432,42 +8469,41 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist6
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist6
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist7
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist8
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist11
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8476,9 +8512,9 @@ init do end
 end
 private class ReduceAction166
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -8492,44 +8528,43 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist12
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8538,9 +8573,9 @@ init do end
 end
 private class ReduceAction167
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -8552,36 +8587,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                null,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8590,9 +8624,9 @@ init do end
 end
 private class ReduceAction168
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
@@ -8606,44 +8640,43 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist7
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist7
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist8
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist9
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist12
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8652,9 +8685,9 @@ init do end
 end
 private class ReduceAction169
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop
                                        var nodearraylist12 = p.pop
                                        var nodearraylist11 = p.pop
@@ -8669,46 +8702,45 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode8 isa nullable TKwwritable
+                                       var pablenode6: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode7,
                                                tkwwritablenode8
                                        )
                                        var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
+                                       assert tkwredefnode9 isa nullable TKwredef
                                        var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwattrnode11 = nodearraylist8
-                                       assert tkwattrnode11 isa TKwattr
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist10
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist13
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode10 isa nullable AVisibility
+                                       var tkwvarnode11 = nodearraylist8
+                                       assert tkwvarnode11 isa nullable TKwvar
+                                       var tattridnode12 = nodearraylist9
+                                       assert tattridnode12 isa nullable TAttrid
+                                       var ptypenode13 = nodearraylist10
+                                       assert ptypenode13 isa nullable AType
+                                       var pexprnode14 = nodearraylist13
+                                       assert pexprnode14 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                pablenode6,
                                                tkwredefnode9,
                                                pvisibilitynode10,
-                                               tkwattrnode11,
-                                               null,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tkwvarnode11,
+                                               tattridnode12,
+                                               ptypenode13,
+                                               pexprnode14
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8717,9 +8749,9 @@ init do end
 end
 private class ReduceAction170
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -8732,38 +8764,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
+                                       assert tkwredefnode4 isa nullable TKwredef
                                        var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
+                                       assert tkwreadablenode5 isa nullable TKwreadable
+                                       var pablenode3: nullable AReadAble = new AReadAble.init_areadable(
                                                tkwredefnode4,
                                                tkwreadablenode5
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist11
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist8
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist11
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
                                                null,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8772,9 +8803,9 @@ init do end
 end
 private class ReduceAction171
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -8786,36 +8817,35 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist5
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist5
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist6
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist7
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist10
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8824,9 +8854,9 @@ init do end
 end
 private class ReduceAction172
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -8839,38 +8869,37 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
+                                       assert tkwwritablenode6 isa nullable TKwwritable
+                                       var pablenode4: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode5,
                                                tkwwritablenode6
                                        )
                                        var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
+                                       assert tkwredefnode7 isa nullable TKwredef
                                        var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwattrnode9 = nodearraylist6
-                                       assert tkwattrnode9 isa TKwattr
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist11
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode8 isa nullable AVisibility
+                                       var tkwvarnode9 = nodearraylist6
+                                       assert tkwvarnode9 isa nullable TKwvar
+                                       var tattridnode10 = nodearraylist7
+                                       assert tattridnode10 isa nullable TAttrid
+                                       var ptypenode11 = nodearraylist8
+                                       assert ptypenode11 isa nullable AType
+                                       var pexprnode12 = nodearraylist11
+                                       assert pexprnode12 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                pablenode4,
                                                tkwredefnode7,
                                                pvisibilitynode8,
-                                               tkwattrnode9,
-                                               null,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tkwvarnode9,
+                                               tattridnode10,
+                                               ptypenode11,
+                                               pexprnode12
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8879,9 +8908,9 @@ init do end
 end
 private class ReduceAction173
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -8892,30 +8921,29 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
+                                       assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
+                                       assert tkwredefnode5 isa nullable TKwredef
                                        var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwattrnode7 = nodearraylist4
-                                       assert tkwattrnode7 isa TKwattr
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa PType
-                                       var pexprnode11 = nodearraylist9
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode9 = nodearraylist6
+                                       assert ptypenode9 isa nullable AType
+                                       var pexprnode10 = nodearraylist9
+                                       assert pexprnode10 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
                                                null,
                                                tkwredefnode5,
                                                pvisibilitynode6,
-                                               tkwattrnode7,
-                                               null,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               pexprnode11
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               ptypenode9,
+                                               pexprnode10
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8924,9 +8952,9 @@ init do end
 end
 private class ReduceAction174
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -8934,36 +8962,23 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist5
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
                                                null,
-                                               tkwvarnode12,
-                                               tattridnode13,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
                                                null,
-                                               null
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -8972,9 +8987,9 @@ init do end
 end
 private class ReduceAction175
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -8983,38 +8998,25 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
                                                null,
-                                               null
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9023,39 +9025,36 @@ init do end
 end
 private class ReduceAction176
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
                                                null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9064,9 +9063,10 @@ init do end
 end
 private class ReduceAction177
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9075,38 +9075,27 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist8
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9115,10 +9104,9 @@ init do end
 end
 private class ReduceAction178
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -9127,40 +9115,23 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
                                                null,
-                                               tkwvarnode12,
-                                               tattridnode13,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
                                                null,
-                                               null
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9169,9 +9140,11 @@ init do end
 end
 private class ReduceAction179
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -9179,32 +9152,25 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
                                                null,
-                                               null
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9213,39 +9179,37 @@ init do end
 end
 private class ReduceAction180
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
                                                null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9254,9 +9218,12 @@ init do end
 end
 private class ReduceAction181
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -9264,32 +9231,27 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 pexprnode8 = nodearraylist8
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteInitPropdef = new AConcreteInitPropdef.init_aconcreteinitpropdef(
                                                pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwinitnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9298,32 +9260,31 @@ init do end
 end
 private class ReduceAction182
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist3
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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,
                                                null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               null,
-                                               null
+                                               pvisibilitynode4,
+                                               tkwtypenode5,
+                                               tclassidnode6,
+                                               ptypenode7
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9332,10 +9293,9 @@ init do end
 end
 private class ReduceAction183
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -9343,38 +9303,24 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
+                                       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 ppropdefnode1: nullable ATypePropdef = new ATypePropdef.init_atypepropdef(
                                                pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               null
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwtypenode5,
+                                               tclassidnode6,
+                                               ptypenode7
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(12), node_list)
@@ -9383,2182 +9329,924 @@ init do end
 end
 private class ReduceAction184
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               null
+                                       var node_list: nullable Object = null
+                                       var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pvisibilitynode1
+                                       p.push(p.go_to(13), node_list)
        end
 init do end
 end
 private class ReduceAction185
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                       var tkwprivatenode2 = nodearraylist1
+                                       assert tkwprivatenode2 isa nullable TKwprivate
+                                       var pvisibilitynode1: nullable APrivateVisibility = new APrivateVisibility.init_aprivatevisibility(
+                                               tkwprivatenode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pvisibilitynode1
+                                       p.push(p.go_to(13), node_list)
        end
 init do end
 end
 private class ReduceAction186
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
+                                       var tkwprotectednode2 = nodearraylist1
+                                       assert tkwprotectednode2 isa nullable TKwprotected
+                                       var pvisibilitynode1: nullable AProtectedVisibility = new AProtectedVisibility.init_aprotectedvisibility(
+                                               tkwprotectednode2
                                        )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               null
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pvisibilitynode1
+                                       p.push(p.go_to(13), node_list)
        end
 init do end
 end
 private class ReduceAction187
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist8
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               null
+                                       var tkwintrudenode2 = nodearraylist1
+                                       assert tkwintrudenode2 isa nullable TKwintrude
+                                       var pvisibilitynode1: nullable AIntrudeVisibility = new AIntrudeVisibility.init_aintrudevisibility(
+                                               tkwintrudenode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pvisibilitynode1
+                                       p.push(p.go_to(13), node_list)
        end
 init do end
 end
 private class ReduceAction188
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var pmethidnode1: nullable AIdMethid = new AIdMethid.init_aidmethid(
+                                               tidnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction189
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                       var tplusnode2 = nodearraylist1
+                                       assert tplusnode2 isa nullable TPlus
+                                       var pmethidnode1: nullable APlusMethid = new APlusMethid.init_aplusmethid(
+                                               tplusnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction190
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               null
+                                       var tminusnode2 = nodearraylist1
+                                       assert tminusnode2 isa nullable TMinus
+                                       var pmethidnode1: nullable AMinusMethid = new AMinusMethid.init_aminusmethid(
+                                               tminusnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction191
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist4
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               null,
-                                               null
+                                       var tstarnode2 = nodearraylist1
+                                       assert tstarnode2 isa nullable TStar
+                                       var pmethidnode1: nullable AStarMethid = new AStarMethid.init_astarmethid(
+                                               tstarnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction192
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist5
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist7
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                       var tslashnode2 = nodearraylist1
+                                       assert tslashnode2 isa nullable TSlash
+                                       var pmethidnode1: nullable ASlashMethid = new ASlashMethid.init_aslashmethid(
+                                               tslashnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction193
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                       var tpercentnode2 = nodearraylist1
+                                       assert tpercentnode2 isa nullable TPercent
+                                       var pmethidnode1: nullable APercentMethid = new APercentMethid.init_apercentmethid(
+                                               tpercentnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction194
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var teqnode2 = nodearraylist1
+                                       assert teqnode2 isa nullable TEq
+                                       var pmethidnode1: nullable AEqMethid = new AEqMethid.init_aeqmethid(
+                                               teqnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction195
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
+                                       var tnenode2 = nodearraylist1
+                                       assert tnenode2 isa nullable TNe
+                                       var pmethidnode1: nullable ANeMethid = new ANeMethid.init_anemethid(
+                                               tnenode2
                                        )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction196
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                       var tlenode2 = nodearraylist1
+                                       assert tlenode2 isa nullable TLe
+                                       var pmethidnode1: nullable ALeMethid = new ALeMethid.init_alemethid(
+                                               tlenode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction197
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var tgenode2 = nodearraylist1
+                                       assert tgenode2 isa nullable TGe
+                                       var pmethidnode1: nullable AGeMethid = new AGeMethid.init_agemethid(
+                                               tgenode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction198
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var tltnode2 = nodearraylist1
+                                       assert tltnode2 isa nullable TLt
+                                       var pmethidnode1: nullable ALtMethid = new ALtMethid.init_altmethid(
+                                               tltnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction199
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var tgtnode2 = nodearraylist1
+                                       assert tgtnode2 isa nullable TGt
+                                       var pmethidnode1: nullable AGtMethid = new AGtMethid.init_agtmethid(
+                                               tgtnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction200
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist3
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               null
+                                       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 = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction201
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                       var tstarshipnode2 = nodearraylist1
+                                       assert tstarshipnode2 isa nullable TStarship
+                                       var pmethidnode1: nullable AStarshipMethid = new AStarshipMethid.init_astarshipmethid(
+                                               tstarshipnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction202
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                       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 = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction203
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       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 = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(14), node_list)
        end
 init do end
 end
 private class ReduceAction204
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
+                                       var listnode2 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var listnode4 = nodearraylist1
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
                                                null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction205
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist8
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist10
-                                       assert ptypenode14 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
+                                       var listnode3 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
                                                null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               null
+                                               listnode6
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction206
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var listnode2 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var ptypenode3 = nodearraylist1
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
+                                               ptypenode3,
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction207
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                       var listnode3 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var ptypenode4 = nodearraylist2
+                                       assert ptypenode4 isa nullable AType
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
+                                               ptypenode4,
+                                               listnode6
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction208
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
+                                       var listnode2 = new Array[Object]
+                                       var listnode4 = new Array[Object]
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
                                                null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               null
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction209
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist4
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa PType
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
+                                       var listnode3 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
                                                null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               null
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction210
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist5
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist9
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                       var listnode2 = new Array[Object]
+                                       var listnode4 = new Array[Object]
+                                       var ptypenode3 = nodearraylist1
+                                       assert ptypenode3 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
+                                               ptypenode3,
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction211
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                       var listnode3 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var ptypenode4 = nodearraylist2
+                                       assert ptypenode4 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
+                                               ptypenode4,
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(15), node_list)
        end
 init do end
 end
 private class ReduceAction212
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
+                                       var node_list: nullable Object = null
+                                       var listnode2 = new Array[Object]
+                                       var listnode4 = new Array[Object]
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
                                                null,
-                                               pexprnode13
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(16), node_list)
        end
 init do end
 end
 private class ReduceAction213
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
+                                       var listnode3 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
                                                null,
-                                               pexprnode15
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(16), node_list)
        end
 init do end
 end
 private class ReduceAction214
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                       var listnode2 = new Array[Object]
+                                       var listnode4 = new Array[Object]
+                                       var ptypenode3 = nodearraylist1
+                                       assert ptypenode3 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode2,
+                                               ptypenode3,
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(16), node_list)
        end
 init do end
 end
 private class ReduceAction215
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                       var listnode3 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var ptypenode4 = nodearraylist2
+                                       assert ptypenode4 isa nullable AType
+                                       var psignaturenode1: nullable ASignature = new ASignature.init_asignature(
+                                               listnode3,
+                                               ptypenode4,
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = psignaturenode1
+                                       p.push(p.go_to(16), node_list)
        end
 init do end
 end
 private class ReduceAction216
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var pparamnode1 = nodearraylist3
+                                       assert pparamnode1 isa nullable AParam
+                                       if pparamnode1 != null then
+                                               listnode2.add(pparamnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(17), node_list)
        end
 init do end
 end
 private class ReduceAction217
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode3 = new Array[Object]
+                                       var pparamnode1 = nodearraylist3
+                                       assert pparamnode1 isa nullable AParam
+                                       var listnode2 = nodearraylist4
+                                       assert listnode2 isa Array[Object]
+                                       if pparamnode1 != null then
+                                               listnode3.add(pparamnode1)
+                                       end
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(17), node_list)
        end
 init do end
 end
 private class ReduceAction218
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist3
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var pexprnode11 = nodearraylist7
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               null,
-                                               pexprnode11
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(17), node_list)
        end
 init do end
 end
 private class ReduceAction219
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pparamnode1 = nodearraylist3
+                                       assert pparamnode1 isa nullable AParam
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(18), node_list)
        end
 init do end
 end
 private class ReduceAction220
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var pparamnode1: nullable AParam = new AParam.init_aparam(
+                                               tidnode2,
                                                null,
-                                               pexprnode15
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(19), node_list)
        end
 init do end
 end
 private class ReduceAction221
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                       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
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(19), node_list)
        end
 init do end
 end
 private class ReduceAction222
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
+                                       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
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pparamnode1
+                                       p.push(p.go_to(19), node_list)
        end
 init do end
 end
 private class ReduceAction223
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist8
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               null,
-                                               pexprnode15
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist2
+                                       assert listnode1 isa Array[Object]
+#                                      if listnode1 != null then
+                                               if listnode2.is_empty then
+                                                       listnode2 = listnode1
+                                               else
+                                                       listnode2.append(listnode1)
+                                               end
+#                                      end
+                                       node_list = listnode2
+                                       p.push(p.go_to(20), node_list)
        end
 init do end
 end
 private class ReduceAction224
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
+                                       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,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                               tbangnode3,
+                                               tidnode4,
+                                               psignaturenode5,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredeclnode1
+                                       p.push(p.go_to(21), node_list)
        end
 init do end
 end
 private class ReduceAction225
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               null,
-                                               pexprnode13
+                                       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 = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredeclnode1
+                                       p.push(p.go_to(21), node_list)
        end
 init do end
 end
 private class ReduceAction226
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
+                                       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,
-                                               pexprnode13
+                                               tbangnode3,
+                                               tidnode4,
+                                               psignaturenode5,
+                                               pexprnode6
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredeclnode1
+                                       p.push(p.go_to(21), node_list)
        end
 init do end
 end
 private class ReduceAction227
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -11566,208 +10254,107 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist4
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var pexprnode11 = nodearraylist8
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               null,
-                                               pexprnode11
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       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
+                                       )
+                                       node_list = pclosuredeclnode1
+                                       p.push(p.go_to(21), node_list)
        end
 init do end
 end
 private class ReduceAction228
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist4
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist5
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist6
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist7
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist10
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
+                                       var listnode4 = new Array[Object]
+                                       var tclassidnode3 = nodearraylist1
+                                       assert tclassidnode3 isa nullable TClassid
+                                       var ptypenode1: nullable AType = new AType.init_atype(
                                                null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                               tclassidnode3,
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(22), node_list)
        end
 init do end
 end
 private class ReduceAction229
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       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
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(22), node_list)
        end
 init do end
 end
 private class ReduceAction230
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
+                                       var listnode5 = new Array[Object]
+                                       var tclassidnode3 = nodearraylist1
+                                       assert tclassidnode3 isa nullable TClassid
+                                       var listnode4 = nodearraylist4
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var ptypenode1: nullable AType = new AType.init_atype(
                                                null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                               tclassidnode3,
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(22), node_list)
        end
 init do end
 end
 private class ReduceAction231
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -11775,269 +10362,1042 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var ptypenode1: nullable AType = new AType.init_atype(
+                                               tkwnullablenode2,
+                                               tclassidnode3,
+                                               listnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(22), node_list)
        end
 init do end
 end
 private class ReduceAction232
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
-                                       )
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               null,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var ptypenode1 = nodearraylist1
+                                       assert ptypenode1 isa nullable AType
+                                       if ptypenode1 != null then
+                                               listnode2.add(ptypenode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(23), node_list)
        end
 init do end
 end
 private class ReduceAction233
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var listnode3 = new Array[Object]
+                                       var ptypenode1 = nodearraylist1
+                                       assert ptypenode1 isa nullable AType
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if ptypenode1 != null then
+                                               listnode3.add(ptypenode1)
+                                       end
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(23), node_list)
        end
 init do end
 end
 private class ReduceAction234
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
-                                       )
-                                       var pvisibilitynode8 = nodearraylist3
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist4
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist5
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist6
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var ptypenode1 = nodearraylist3
+                                       assert ptypenode1 isa nullable AType
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(24), node_list)
        end
 init do end
 end
 private class ReduceAction235
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var ptypenode1 = nodearraylist3
+                                       assert ptypenode1 isa nullable AType
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(25), node_list)
+       end
+init do end
+end
+private class ReduceAction236
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode2 = nodearraylist2
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(26), node_list)
+       end
+init do end
+end
+private class ReduceAction237
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist2
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       if pexprnode2 != null then
+                                               listnode4.add(pexprnode2)
+                                       end
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(26), node_list)
+       end
+init do end
+end
+private class ReduceAction238
+special 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: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(26), node_list)
+       end
+init do end
+end
+private class ReduceAction239
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(26), node_list)
+       end
+init do end
+end
+private class ReduceAction240
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(26), node_list)
+       end
+init do end
+end
+private class ReduceAction241
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist2
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(27), node_list)
+       end
+init do end
+end
+private class ReduceAction242
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction243
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction244
+special 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(28), node_list)
+       end
+init do end
+end
+private class ReduceAction245
+special 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(28), node_list)
+       end
+init do end
+end
+private class ReduceAction246
+special 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,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction247
+special 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,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction248
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
+                                               tkwbreaknode2,
+                                               null,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction249
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction250
+special 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(28), node_list)
+       end
+init do end
+end
+private class ReduceAction251
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction252
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var plabelnode3 = nodearraylist2
+                                       assert plabelnode3 isa nullable ALabel
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               plabelnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction253
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction254
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction255
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction256
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction257
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction258
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction259
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction260
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction261
+special 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 listnode6 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction262
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction263
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction264
+special 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 tkwsupernode3 = nodearraylist1
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               null,
+                                               tkwsupernode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction265
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction266
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction267
+special 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 pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(28), node_list)
+       end
+init do end
+end
+private class ReduceAction268
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwlabelnode2 = nodearraylist1
+                                       assert tkwlabelnode2 isa nullable TKwlabel
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var plabelnode1: nullable ALabel = new ALabel.init_alabel(
+                                               tkwlabelnode2,
+                                               tidnode3
+                                       )
+                                       node_list = plabelnode1
+                                       p.push(p.go_to(29), node_list)
+       end
+init do end
+end
+private class ReduceAction269
+special 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
+                                       assert pclosuredefnode1 isa nullable AClosureDef
+                                       if pclosuredefnode1 != null then
+                                               listnode2.add(pclosuredefnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(30), node_list)
+       end
+init do end
+end
+private class ReduceAction270
+special 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 pclosuredefnode1 = nodearraylist1
+                                       assert pclosuredefnode1 isa nullable AClosureDef
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pclosuredefnode1 != null then
+                                               listnode3.add(pclosuredefnode1)
+                                       end
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(30), node_list)
+       end
+init do end
+end
+private class ReduceAction271
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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 listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction272
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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 listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
+                                       )
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction273
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               null,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction274
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction236
+private class ReduceAction275
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12046,42 +11406,49 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode6 = nodearraylist2
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist3
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist4
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist5
-                                       assert ptypenode10 isa PType
-                                       var pexprnode11 = nodearraylist8
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               null,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               pexprnode11
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction237
+private class ReduceAction276
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -12091,118 +11458,145 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwwritablenode8 = nodearraylist3
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode10 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       if pexprnode8 != null then
+                                               listnode10.add(pexprnode8)
+                                       end
+#                                      if listnode9 != null then
+                                               if listnode10.is_empty then
+                                                       listnode10 = listnode9
+                                               else
+                                                       listnode10.append(listnode9)
+                                               end
+#                                      end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode10
                                        )
-                                       var tkwredefnode9 = nodearraylist4
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist5
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist6
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist7
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist8
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist11
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction238
+private class ReduceAction277
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
                                        )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction278
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction239
+private class ReduceAction279
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -12211,51 +11605,42 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwreadablenode5 = nodearraylist2
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               null,
-                                               tkwreadablenode5
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                       var plabelnode9 = nodearraylist8
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode9
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction240
+private class ReduceAction280
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist12 = p.pop
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -12265,123 +11650,124 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
+                                       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 listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       var tkwwritablenode8 = nodearraylist4
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode8
+                                       var plabelnode10 = nodearraylist9
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode10
                                        )
-                                       var tkwredefnode9 = nodearraylist5
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist6
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist7
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist8
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist9
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist12
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction281
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist6
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction241
+private class ReduceAction282
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
-                                       )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var tkwwritablenode8 = nodearraylist5
-                                       assert tkwwritablenode8 isa TKwwritable
-                                       var pablenode6 = new AWriteAble.init_awriteable(
-                                               tkwredefnode7,
-                                               tkwwritablenode8
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       var tkwredefnode9 = nodearraylist6
-                                       assert tkwredefnode9 isa TKwredef
-                                       var pvisibilitynode10 = nodearraylist7
-                                       assert pvisibilitynode10 isa PVisibility
-                                       var tkwvarnode12 = nodearraylist8
-                                       assert tkwvarnode12 isa TKwvar
-                                       var tattridnode13 = nodearraylist9
-                                       assert tattridnode13 isa TAttrid
-                                       var ptypenode14 = nodearraylist10
-                                       assert ptypenode14 isa PType
-                                       var pexprnode15 = nodearraylist13
-                                       assert pexprnode15 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               pablenode6,
-                                               tkwredefnode9,
-                                               pvisibilitynode10,
-                                               null,
-                                               tkwvarnode12,
-                                               tattridnode13,
-                                               ptypenode14,
-                                               pexprnode15
+                                       var plabelnode8 = nodearraylist5
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction242
+private class ReduceAction283
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -12391,50 +11777,51 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode4 = nodearraylist2
-                                       assert tkwredefnode4 isa TKwredef
-                                       var tkwreadablenode5 = nodearraylist3
-                                       assert tkwreadablenode5 isa TKwreadable
-                                       var pablenode3 = new AReadAble.init_areadable(
-                                               tkwredefnode4,
-                                               tkwreadablenode5
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist11
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               pablenode3,
-                                               null,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                       var plabelnode10 = nodearraylist9
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode10
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction243
+private class ReduceAction284
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -12445,52 +11832,60 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwwritablenode6 = nodearraylist2
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               null,
-                                               tkwwritablenode6
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode10 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       if pexprnode8 != null then
+                                               listnode10.add(pexprnode8)
+                                       end
+#                                      if listnode9 != null then
+                                               if listnode10.is_empty then
+                                                       listnode10 = listnode9
+                                               else
+                                                       listnode10.append(listnode9)
+                                               end
+#                                      end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode10
                                        )
-                                       var tkwredefnode7 = nodearraylist3
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist4
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist5
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist6
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist7
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist10
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                       var plabelnode11 = nodearraylist10
+                                       assert plabelnode11 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode11
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction244
+private class ReduceAction285
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist11 = p.pop
-                                       var nodearraylist10 = p.pop
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -12498,168 +11893,204 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var tkwwritablenode6 = nodearraylist3
-                                       assert tkwwritablenode6 isa TKwwritable
-                                       var pablenode4 = new AWriteAble.init_awriteable(
-                                               tkwredefnode5,
-                                               tkwwritablenode6
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       var tkwredefnode7 = nodearraylist4
-                                       assert tkwredefnode7 isa TKwredef
-                                       var pvisibilitynode8 = nodearraylist5
-                                       assert pvisibilitynode8 isa PVisibility
-                                       var tkwvarnode10 = nodearraylist6
-                                       assert tkwvarnode10 isa TKwvar
-                                       var tattridnode11 = nodearraylist7
-                                       assert tattridnode11 isa TAttrid
-                                       var ptypenode12 = nodearraylist8
-                                       assert ptypenode12 isa PType
-                                       var pexprnode13 = nodearraylist11
-                                       assert pexprnode13 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pablenode4,
-                                               tkwredefnode7,
-                                               pvisibilitynode8,
-                                               null,
-                                               tkwvarnode10,
-                                               tattridnode11,
-                                               ptypenode12,
-                                               pexprnode13
+                                       var plabelnode9 = nodearraylist7
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode9
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction245
+private class ReduceAction286
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode5 = nodearraylist2
-                                       assert tkwredefnode5 isa TKwredef
-                                       var pvisibilitynode6 = nodearraylist3
-                                       assert pvisibilitynode6 isa PVisibility
-                                       var tkwvarnode8 = nodearraylist4
-                                       assert tkwvarnode8 isa TKwvar
-                                       var tattridnode9 = nodearraylist5
-                                       assert tattridnode9 isa TAttrid
-                                       var ptypenode10 = nodearraylist6
-                                       assert ptypenode10 isa PType
-                                       var pexprnode11 = nodearraylist9
-                                       assert pexprnode11 isa PExpr
-                                       var ppropdefnode1 = new AAttrPropdef.init_aattrpropdef(
-                                               pdocnode2,
-                                               null,
-                                               null,
-                                               tkwredefnode5,
-                                               pvisibilitynode6,
-                                               null,
-                                               tkwvarnode8,
-                                               tattridnode9,
-                                               ptypenode10,
-                                               pexprnode11
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var plabelnode9 = nodearraylist6
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode9
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction246
+private class ReduceAction287
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
+                                       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 pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
+       end
+init do end
+end
+private class ReduceAction288
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist6
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               null,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       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,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(31), node_list)
        end
 init do end
 end
-private class ReduceAction247
+private class ReduceAction289
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               null,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction248
+private class ReduceAction290
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -12667,38 +12098,49 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       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 listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction249
+private class ReduceAction291
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -12706,39 +12148,50 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction250
+private class ReduceAction292
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -12746,1110 +12199,1520 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa TKwinit
-                                       var psignaturenode7 = nodearraylist4
-                                       assert psignaturenode7 isa PSignature
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode10 = new Array[Object]
                                        var pexprnode8 = nodearraylist6
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               null,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       assert pexprnode8 isa nullable AExpr
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       if pexprnode8 != null then
+                                               listnode10.add(pexprnode8)
+                                       end
+#                                      if listnode9 != null then
+                                               if listnode10.is_empty then
+                                                       listnode10 = listnode9
+                                               else
+                                                       listnode10.append(listnode9)
+                                               end
+#                                      end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode10
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction251
+private class ReduceAction293
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa TKwinit
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
+                                       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,
-                                               psignaturenode7,
-                                               pexprnode8
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction252
+private class ReduceAction294
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist3
-                                       assert tkwinitnode5 isa TKwinit
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
                                                null,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(32), node_list)
        end
 init do end
 end
-private class ReduceAction253
+private class ReduceAction295
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwinitnode5 = nodearraylist4
-                                       assert tkwinitnode5 isa TKwinit
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteInitPropdef.init_aconcreteinitpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwinitnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       var tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var pclosureidnode1: nullable ASimpleClosureId = new ASimpleClosureId.init_asimpleclosureid(
+                                               tidnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pclosureidnode1
+                                       p.push(p.go_to(33), node_list)
        end
 init do end
 end
-private class ReduceAction254
+private class ReduceAction296
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var pclosureidnode1: nullable ABreakClosureId = new ABreakClosureId.init_abreakclosureid(
+                                               tkwbreaknode2
+                                       )
+                                       node_list = pclosureidnode1
+                                       p.push(p.go_to(33), node_list)
+       end
+init do end
+end
+private class ReduceAction297
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwtypenode5 = nodearraylist3
-                                       assert tkwtypenode5 isa TKwtype
-                                       var tclassidnode6 = nodearraylist4
-                                       assert tclassidnode6 isa TClassid
-                                       var ptypenode7 = nodearraylist5
-                                       assert ptypenode7 isa PType
-                                       var ppropdefnode1 = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
+                                       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,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7
+                                               null,
+                                               null
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(34), node_list)
        end
 init do end
 end
-private class ReduceAction255
+private class ReduceAction298
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwtypenode5 = nodearraylist4
-                                       assert tkwtypenode5 isa TKwtype
-                                       var tclassidnode6 = nodearraylist5
-                                       assert tclassidnode6 isa TClassid
-                                       var ptypenode7 = nodearraylist6
-                                       assert ptypenode7 isa PType
-                                       var ppropdefnode1 = new ATypePropdef.init_atypepropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwtypenode5,
-                                               tclassidnode6,
-                                               ptypenode7
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(12), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(34), node_list)
        end
 init do end
 end
-private class ReduceAction256
+private class ReduceAction299
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var pvisibilitynode1 = new APublicVisibility.init_apublicvisibility(
+                                       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 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
                                        )
-                                       node_list = pvisibilitynode1
-                                       p.push(p.go_to(13), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(34), node_list)
        end
 init do end
 end
-private class ReduceAction257
+private class ReduceAction300
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwprivatenode2 = nodearraylist1
-                                       assert tkwprivatenode2 isa TKwprivate
-                                       var pvisibilitynode1 = new APrivateVisibility.init_aprivatevisibility(
-                                               tkwprivatenode2
+                                       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
                                        )
-                                       node_list = pvisibilitynode1
-                                       p.push(p.go_to(13), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(34), node_list)
        end
 init do end
 end
-private class ReduceAction258
+private class ReduceAction301
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwprotectednode2 = nodearraylist1
-                                       assert tkwprotectednode2 isa TKwprotected
-                                       var pvisibilitynode1 = new AProtectedVisibility.init_aprotectedvisibility(
-                                               tkwprotectednode2
+                                       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
                                        )
-                                       node_list = pvisibilitynode1
-                                       p.push(p.go_to(13), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction259
+private class ReduceAction302
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwintrudenode2 = nodearraylist1
-                                       assert tkwintrudenode2 isa TKwintrude
-                                       var pvisibilitynode1 = new AIntrudeVisibility.init_aintrudevisibility(
-                                               tkwintrudenode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       node_list = pvisibilitynode1
-                                       p.push(p.go_to(13), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction260
+private class ReduceAction303
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TId
-                                       var pmethidnode1 = new AIdMethid.init_aidmethid(
-                                               tidnode2
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tassignnode6 = nodearraylist6
+                                       assert tassignnode6 isa nullable TAssign
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               tassignnode6,
+                                               pexprnode7
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction261
+private class ReduceAction304
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tplusnode2 = nodearraylist1
-                                       assert tplusnode2 isa TPlus
-                                       var pmethidnode1 = new APlusMethid.init_aplusmethid(
-                                               tplusnode2
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tassignnode6 = nodearraylist3
+                                       assert tassignnode6 isa nullable TAssign
+                                       var pexprnode7 = nodearraylist4
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               tassignnode6,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction262
+private class ReduceAction305
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa TMinus
-                                       var pmethidnode1 = new AMinusMethid.init_aminusmethid(
-                                               tminusnode2
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var tassignnode5 = nodearraylist3
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable ABraAssignExpr = new ABraAssignExpr.init_abraassignexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               tassignnode5,
+                                               pexprnode6
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction263
+private class ReduceAction306
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tstarnode2 = nodearraylist1
-                                       assert tstarnode2 isa TStar
-                                       var pmethidnode1 = new AStarMethid.init_astarmethid(
-                                               tstarnode2
+                                       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
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction264
+private class ReduceAction307
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tslashnode2 = nodearraylist1
-                                       assert tslashnode2 isa TSlash
-                                       var pmethidnode1 = new ASlashMethid.init_aslashmethid(
-                                               tslashnode2
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction265
+private class ReduceAction308
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tpercentnode2 = nodearraylist1
-                                       assert tpercentnode2 isa TPercent
-                                       var pmethidnode1 = new APercentMethid.init_apercentmethid(
-                                               tpercentnode2
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var passignopnode6 = nodearraylist6
+                                       assert passignopnode6 isa nullable AAssignOp
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               passignopnode6,
+                                               pexprnode7
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction266
+private class ReduceAction309
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var teqnode2 = nodearraylist1
-                                       assert teqnode2 isa TEq
-                                       var pmethidnode1 = new AEqMethid.init_aeqmethid(
-                                               teqnode2
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var passignopnode6 = nodearraylist3
+                                       assert passignopnode6 isa nullable AAssignOp
+                                       var pexprnode7 = nodearraylist4
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               passignopnode6,
+                                               pexprnode7
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction267
+private class ReduceAction310
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tnenode2 = nodearraylist1
-                                       assert tnenode2 isa TNe
-                                       var pmethidnode1 = new ANeMethid.init_anemethid(
-                                               tnenode2
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var passignopnode5 = nodearraylist3
+                                       assert passignopnode5 isa nullable AAssignOp
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable ABraReassignExpr = new ABraReassignExpr.init_abrareassignexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               passignopnode5,
+                                               pexprnode6
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(35), node_list)
        end
 init do end
 end
-private class ReduceAction268
+private class ReduceAction311
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tlenode2 = nodearraylist1
-                                       assert tlenode2 isa TLe
-                                       var pmethidnode1 = new ALeMethid.init_alemethid(
-                                               tlenode2
+                                       var tpluseqnode2 = nodearraylist1
+                                       assert tpluseqnode2 isa nullable TPluseq
+                                       var passignopnode1: nullable APlusAssignOp = new APlusAssignOp.init_aplusassignop(
+                                               tpluseqnode2
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = passignopnode1
+                                       p.push(p.go_to(36), node_list)
        end
 init do end
 end
-private class ReduceAction269
+private class ReduceAction312
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tgenode2 = nodearraylist1
-                                       assert tgenode2 isa TGe
-                                       var pmethidnode1 = new AGeMethid.init_agemethid(
-                                               tgenode2
+                                       var tminuseqnode2 = nodearraylist1
+                                       assert tminuseqnode2 isa nullable TMinuseq
+                                       var passignopnode1: nullable AMinusAssignOp = new AMinusAssignOp.init_aminusassignop(
+                                               tminuseqnode2
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = passignopnode1
+                                       p.push(p.go_to(36), node_list)
        end
 init do end
 end
-private class ReduceAction270
+private class ReduceAction313
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tltnode2 = nodearraylist1
-                                       assert tltnode2 isa TLt
-                                       var pmethidnode1 = new ALtMethid.init_altmethid(
-                                               tltnode2
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
+                                       end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode5
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
-       end
-init do end
-end
-private class ReduceAction271
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tgtnode2 = nodearraylist1
-                                       assert tgtnode2 isa TGt
-                                       var pmethidnode1 = new AGtMethid.init_agtmethid(
-                                               tgtnode2
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction272
+private class ReduceAction314
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TObra
-                                       var tcbranode3 = nodearraylist2
-                                       assert tcbranode3 isa TCbra
-                                       var pmethidnode1 = new ABraMethid.init_abramethid(
-                                               tobranode2,
-                                               tcbranode3
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       if pexprnode4 != null then
+                                               listnode6.add(pexprnode4)
+                                       end
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
-       end
-init do end
-end
-private class ReduceAction273
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tstarshipnode2 = nodearraylist1
-                                       assert tstarshipnode2 isa TStarship
-                                       var pmethidnode1 = new AStarshipMethid.init_astarshipmethid(
-                                               tstarshipnode2
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction274
+private class ReduceAction315
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa TId
-                                       var tassignnode3 = nodearraylist2
-                                       assert tassignnode3 isa TAssign
-                                       var pmethidnode1 = new AAssignMethid.init_aassignmethid(
-                                               tidnode2,
-                                               tassignnode3
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction275
+private class ReduceAction316
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tobranode2 = nodearraylist1
-                                       assert tobranode2 isa TObra
-                                       var tcbranode3 = nodearraylist2
-                                       assert tcbranode3 isa TCbra
-                                       var tassignnode4 = nodearraylist3
-                                       assert tassignnode4 isa TAssign
-                                       var pmethidnode1 = new ABraassignMethid.init_abraassignmethid(
-                                               tobranode2,
-                                               tcbranode3,
-                                               tassignnode4
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       node_list = pmethidnode1
-                                       p.push(p.go_to(14), node_list)
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction276
+private class ReduceAction317
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = new Array[Object]
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
                                        var listnode5 = new Array[Object]
-                                       var listnode4 = nodearraylist1 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
                                        end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
-                                               null,
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode5
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       var plabelnode6 = nodearraylist6
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction277
+private class ReduceAction318
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
                                        var listnode6 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var listnode5 = nodearraylist2 
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist4
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+                                       if pexprnode4 != null then
+                                               listnode6.add(pexprnode4)
+                                       end
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
-                                               null,
+#                                      end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode6
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       var plabelnode7 = nodearraylist7
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction278
+private class ReduceAction319
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode5 = new Array[Object]
-                                       var ptypenode3 = nodearraylist1
-                                       assert ptypenode3 isa PType
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
-                                               ptypenode3,
-                                               listnode5
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
+                                       )
+                                       var plabelnode5 = nodearraylist4
+                                       assert plabelnode5 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
+       end
+init do end
+end
+private class ReduceAction320
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       var plabelnode5 = nodearraylist3
+                                       assert plabelnode5 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction279
+private class ReduceAction321
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       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 listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var ptypenode4 = nodearraylist2
-                                       assert ptypenode4 isa PType
-                                       var listnode5 = nodearraylist3 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
-                                               else
-                                                       listnode6.append(listnode5)
-                                               end
-                                       end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
-                                               ptypenode4,
-                                               listnode6
+                                       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 = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(37), node_list)
        end
 init do end
 end
-private class ReduceAction280
+private class ReduceAction322
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
-                                               null,
-                                               listnode4
+                                       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
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction281
+private class ReduceAction323
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode5 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
-                                               null,
-                                               listnode5
+                                       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
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction282
+private class ReduceAction324
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode4 = new Array[Object]
-                                       var ptypenode3 = nodearraylist1
-                                       assert ptypenode3 isa PType
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
-                                               ptypenode3,
-                                               listnode4
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       if pexprnode5 != null then
+                                               listnode6.add(pexprnode5)
+                                       end
+                                       var pexprnode4: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       var pexprnode7 = nodearraylist9
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               pexprnode4,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction283
+private class ReduceAction325
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var listnode6 = nodearraylist8
+                                       assert listnode6 isa Array[Object]
+                                       if pexprnode5 != null then
+                                               listnode7.add(pexprnode5)
+                                       end
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode7.append(listnode6)
                                                end
-                                       end
-                                       var ptypenode4 = nodearraylist2
-                                       assert ptypenode4 isa PType
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
-                                               ptypenode4,
-                                               listnode5
+#                                      end
+                                       var pexprnode4: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(15), node_list)
+                                       var pexprnode8 = nodearraylist10
+                                       assert pexprnode8 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
+                                               pexprnode3,
+                                               pexprnode4,
+                                               pexprnode8
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction284
+private class ReduceAction326
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var listnode2 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
+                                       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,
                                                null,
-                                               listnode4
+                                               pexprnode5
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(16), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction285
+private class ReduceAction327
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
+                                       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,
                                                null,
-                                               listnode5
+                                               pexprnode5
                                        )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(16), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(38), node_list)
        end
 init do end
 end
-private class ReduceAction286
+private class ReduceAction328
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var listnode4 = new Array[Object]
-                                       var ptypenode3 = nodearraylist1
-                                       assert ptypenode3 isa PType
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode2,
-                                               ptypenode3,
-                                               listnode4
-                                       )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(16), node_list)
+                                       var pexprnode1 = nodearraylist2
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(39), node_list)
        end
 init do end
 end
-private class ReduceAction287
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var ptypenode4 = nodearraylist2
-                                       assert ptypenode4 isa PType
-                                       var psignaturenode1 = new ASignature.init_asignature(
-                                               listnode3,
-                                               ptypenode4,
-                                               listnode5
-                                       )
-                                       node_list = psignaturenode1
-                                       p.push(p.go_to(16), node_list)
+private class ReduceAction329
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       node_list = null
+                                       p.push(p.go_to(39), node_list)
        end
 init do end
 end
-private class ReduceAction288
+private class ReduceAction330
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pparamnode1 = nodearraylist3
-                                       assert pparamnode1 isa PParam
-                                       if pparamnode1 != null then
-                                               listnode2.add(pparamnode1)
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       if pexprnode6 != null then
+                                               listnode7.add(pexprnode6)
                                        end
-                                       node_list = listnode2
-                                       p.push(p.go_to(17), node_list)
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction289
+private class ReduceAction331
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode3 = new Array[Object]
-                                       var pparamnode1 = nodearraylist3
-                                       assert pparamnode1 isa PParam
-                                       var listnode2 = nodearraylist4 
-                                       assert listnode2 isa Array[Object]
-                                       if pparamnode1 != null then
-                                               listnode3.add(pparamnode1)
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var listnode7 = nodearraylist8
+                                       assert listnode7 isa Array[Object]
+                                       if pexprnode6 != null then
+                                               listnode8.add(pexprnode6)
                                        end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+#                                      if listnode7 != null then
+                                               if listnode8.is_empty then
+                                                       listnode8 = listnode7
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode8.append(listnode7)
                                                end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(17), node_list)
+#                                      end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction290
+private class ReduceAction332
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode1 = new Array[Object]
-                                       node_list = listnode1
-                                       p.push(p.go_to(17), node_list)
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction291
+private class ReduceAction333
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pparamnode1 = nodearraylist3
-                                       assert pparamnode1 isa PParam
-                                       node_list = pparamnode1
-                                       p.push(p.go_to(18), node_list)
-       end
-init do end
-end
-private class ReduceAction292
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tidnode2 = nodearraylist1
-                                       assert tidnode2 isa TId
-                                       var pparamnode1 = new AParam.init_aparam(
-                                               tidnode2,
-                                               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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
                                                null
                                        )
-                                       node_list = pparamnode1
-                                       p.push(p.go_to(19), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction293
+private class ReduceAction334
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tidnode2 = nodearraylist1
-                                       assert tidnode2 isa TId
-                                       var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa PType
-                                       var pparamnode1 = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               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 listnode7 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       if pexprnode6 != null then
+                                               listnode7.add(pexprnode6)
+                                       end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = pparamnode1
-                                       p.push(p.go_to(19), node_list)
+                                       var plabelnode8 = nodearraylist10
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode8
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction294
+private class ReduceAction335
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tidnode2 = nodearraylist1
-                                       assert tidnode2 isa TId
-                                       var ptypenode3 = nodearraylist2
-                                       assert ptypenode3 isa PType
-                                       var tdotdotdotnode4 = nodearraylist3
-                                       assert tdotdotdotnode4 isa TDotdotdot
-                                       var pparamnode1 = new AParam.init_aparam(
-                                               tidnode2,
-                                               ptypenode3,
-                                               tdotdotdotnode4
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var listnode7 = nodearraylist8
+                                       assert listnode7 isa Array[Object]
+                                       if pexprnode6 != null then
+                                               listnode8.add(pexprnode6)
+                                       end
+#                                      if listnode7 != null then
+                                               if listnode8.is_empty then
+                                                       listnode8 = listnode7
+                                               else
+                                                       listnode8.append(listnode7)
+                                               end
+#                                      end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pparamnode1
-                                       p.push(p.go_to(19), node_list)
+                                       var plabelnode9 = nodearraylist11
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode9
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction295
+private class ReduceAction336
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = new Array[Object]
-                                       var listnode1 = nodearraylist2 
-                                       assert listnode1 isa Array[Object]
-                                       if listnode1 != null then
-                                               if listnode2.is_empty then
-                                                       listnode2 = listnode1
-                                               else
-                                                       listnode2.append(listnode1)
-                                               end
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(20), node_list)
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var plabelnode7 = nodearraylist8
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction296
+private class ReduceAction337
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa TId
-                                       var psignaturenode5 = nodearraylist4
-                                       assert psignaturenode5 isa PSignature
-                                       var pclosuredeclnode1 = new AClosureDecl.init_aclosuredecl(
-                                               tkwwithnode2,
-                                               null,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
                                        )
-                                       node_list = pclosuredeclnode1
-                                       p.push(p.go_to(21), node_list)
+                                       var plabelnode7 = nodearraylist7
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction297
+private class ReduceAction338
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwbreaknode3 = nodearraylist2
-                                       assert tkwbreaknode3 isa TKwbreak
-                                       var tidnode4 = nodearraylist4
-                                       assert tidnode4 isa TId
-                                       var psignaturenode5 = nodearraylist5
-                                       assert psignaturenode5 isa PSignature
-                                       var pclosuredeclnode1 = new AClosureDecl.init_aclosuredecl(
-                                               tkwwithnode2,
-                                               tkwbreaknode3,
-                                               tidnode4,
-                                               psignaturenode5,
+                                       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 = pclosuredeclnode1
-                                       p.push(p.go_to(21), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(40), node_list)
        end
 init do end
 end
-private class ReduceAction298
+private class ReduceAction339
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -13857,31 +13720,47 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tidnode4 = nodearraylist3
-                                       assert tidnode4 isa TId
-                                       var psignaturenode5 = nodearraylist4
-                                       assert psignaturenode5 isa PSignature
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa PExpr
-                                       var pclosuredeclnode1 = new AClosureDecl.init_aclosuredecl(
-                                               tkwwithnode2,
-                                               null,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pclosuredeclnode1
-                                       p.push(p.go_to(21), node_list)
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction299
+private class ReduceAction340
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -13890,1460 +13769,1519 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwbreaknode3 = nodearraylist2
-                                       assert tkwbreaknode3 isa TKwbreak
-                                       var tidnode4 = nodearraylist4
-                                       assert tidnode4 isa TId
-                                       var psignaturenode5 = nodearraylist5
-                                       assert psignaturenode5 isa PSignature
-                                       var pexprnode6 = nodearraylist7
-                                       assert pexprnode6 isa PExpr
-                                       var pclosuredeclnode1 = new AClosureDecl.init_aclosuredecl(
-                                               tkwwithnode2,
-                                               tkwbreaknode3,
-                                               tidnode4,
-                                               psignaturenode5,
-                                               pexprnode6
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist12
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = pclosuredeclnode1
-                                       p.push(p.go_to(21), node_list)
-       end
-init do end
-end
-private class ReduceAction300
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa TClassid
-                                       var ptypenode1 = new AType.init_atype(
-                                               tclassidnode2,
-                                               listnode3
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
-                                       node_list = ptypenode1
-                                       p.push(p.go_to(22), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction301
+private class ReduceAction341
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode4 = new Array[Object]
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa TClassid
-                                       var listnode3 = nodearraylist4 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var ptypenode1 = new AType.init_atype(
-                                               tclassidnode2,
-                                               listnode4
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = ptypenode1
-                                       p.push(p.go_to(22), node_list)
-       end
-init do end
-end
-private class ReduceAction302
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var ptypenode1 = nodearraylist1
-                                       assert ptypenode1 isa PType
-                                       if ptypenode1 != null then
-                                               listnode2.add(ptypenode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(23), node_list)
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction303
+private class ReduceAction342
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode3 = new Array[Object]
-                                       var ptypenode1 = nodearraylist1
-                                       assert ptypenode1 isa PType
-                                       var listnode2 = nodearraylist2 
-                                       assert listnode2 isa Array[Object]
-                                       if ptypenode1 != null then
-                                               listnode3.add(ptypenode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(23), node_list)
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction304
+private class ReduceAction343
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var ptypenode1 = nodearraylist3
-                                       assert ptypenode1 isa PType
-                                       node_list = ptypenode1
-                                       p.push(p.go_to(24), node_list)
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var plabelnode9 = nodearraylist14
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode9
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction305
+private class ReduceAction344
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 ptypenode1 = nodearraylist3
-                                       assert ptypenode1 isa PType
-                                       node_list = ptypenode1
-                                       p.push(p.go_to(25), node_list)
-       end
-init do end
-end
-private class ReduceAction306
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist12
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
+                                       )
+                                       var plabelnode10 = nodearraylist15
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode10
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(26), node_list)
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction307
+private class ReduceAction345
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode3 = new Array[Object]
-                                       var pexprnode2 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode3
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist12
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(26), node_list)
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction308
+private class ReduceAction346
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist3 
-                                       assert listnode3 isa Array[Object]
-                                       if pexprnode2 != null then
-                                               listnode4.add(pexprnode2)
-                                       end
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode4
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist11
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(26), node_list)
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction309
+private class ReduceAction347
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = new Array[Object]
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode2
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var pexprnode6 = nodearraylist10
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(26), node_list)
+                                       p.push(p.go_to(41), node_list)
        end
 init do end
 end
-private class ReduceAction310
+private class ReduceAction348
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode2
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(26), node_list)
+                                       p.push(p.go_to(42), node_list)
        end
 init do end
 end
-private class ReduceAction311
+private class ReduceAction349
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist2
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(27), node_list)
+                                       p.push(p.go_to(42), node_list)
        end
 init do end
 end
-private class ReduceAction312
+private class ReduceAction350
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       var tidnode1 = nodearraylist1
+                                       assert tidnode1 isa nullable TId
+                                       node_list = tidnode1
+                                       p.push(p.go_to(43), node_list)
        end
 init do end
 end
-private class ReduceAction313
+private class ReduceAction351
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(44), node_list)
        end
 init do end
 end
-private class ReduceAction314
+private class ReduceAction352
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwreturn
-                                       var pexprnode1 = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
-                                               null
+                                       var listnode5 = new Array[Object]
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(44), node_list)
        end
 init do end
 end
-private class ReduceAction315
+private class ReduceAction353
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreturnnode2 = nodearraylist1
-                                       assert tkwreturnnode2 isa TKwreturn
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
-                                               pexprnode3
+                                       var listnode5 = new Array[Object]
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(44), node_list)
        end
 init do end
 end
-private class ReduceAction316
+private class ReduceAction354
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa TKwbreak
-                                       var pexprnode1 = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               null
+                                       var listnode4 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(44), node_list)
        end
 init do end
 end
-private class ReduceAction317
+private class ReduceAction355
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa TKwbreak
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(45), node_list)
        end
 init do end
 end
-private class ReduceAction318
+private class ReduceAction356
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwabortnode2 = nodearraylist1
-                                       assert tkwabortnode2 isa TKwabort
-                                       var pexprnode1 = new AAbortExpr.init_aabortexpr(
-                                               tkwabortnode2
+                                       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 = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(45), node_list)
        end
 init do end
 end
-private class ReduceAction319
+private class ReduceAction357
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa TKwcontinue
-                                       var pexprnode1 = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(46), node_list)
        end
 init do end
 end
-private class ReduceAction320
+private class ReduceAction358
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa TKwcontinue
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
+                                       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
-                                       p.push(p.go_to(28), node_list)
-       end
-init do end
-end
-private class ReduceAction321
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(46), node_list)
        end
 init do end
 end
-private class ReduceAction322
+private class ReduceAction359
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(46), node_list)
        end
 init do end
 end
-private class ReduceAction323
+private class ReduceAction360
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(47), node_list)
        end
 init do end
 end
-private class ReduceAction324
+private class ReduceAction361
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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 = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(47), node_list)
        end
 init do end
 end
-private class ReduceAction325
+private class ReduceAction362
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction326
+private class ReduceAction363
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
+                                       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 listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AEqExpr = new AEqExpr.init_aeqexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction327
+private class ReduceAction364
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+                                       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,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction328
+private class ReduceAction365
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var listnode6 = nodearraylist6 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction329
+private class ReduceAction366
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var listnode6 = nodearraylist3 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+                                       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,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction330
+private class ReduceAction367
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               null,
-                                               tkwsupernode3,
-                                               listnode5
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction331
+private class ReduceAction368
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
-                                       var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode3,
-                                               listnode5
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction332
+private class ReduceAction369
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
+                                       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 PExpr
-                                       var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGeExpr = new AGeExpr.init_ageexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction333
+private class ReduceAction370
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+                                       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,
-                                               tkwinitnode3,
-                                               listnode5
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(28), node_list)
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction334
+private class ReduceAction371
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pclosuredefnode1 = nodearraylist1
-                                       assert pclosuredefnode1 isa PClosureDef
-                                       if pclosuredefnode1 != null then
-                                               listnode2.add(pclosuredefnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(29), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(48), node_list)
        end
 init do end
 end
-private class ReduceAction335
+private class ReduceAction372
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pclosuredefnode1 = nodearraylist1
-                                       assert pclosuredefnode1 isa PClosureDef
-                                       var listnode2 = nodearraylist2 
-                                       assert listnode2 isa Array[Object]
-                                       if pclosuredefnode1 != null then
-                                               listnode3.add(pclosuredefnode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(29), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(49), node_list)
        end
 init do end
 end
-private class ReduceAction336
+private class ReduceAction373
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwdonode4 = nodearraylist2
-                                       assert tkwdonode4 isa TKwdo
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode3,
-                                               tkwdonode4,
-                                               pexprnode5
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(30), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(49), node_list)
        end
 init do end
 end
-private class ReduceAction337
+private class ReduceAction374
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa TKwdo
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(30), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(49), node_list)
        end
 init do end
 end
-private class ReduceAction338
+private class ReduceAction375
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwdonode4 = nodearraylist2
-                                       assert tkwdonode4 isa TKwdo
-                                       var listnode7 = new Array[Object]
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       if pexprnode6 != null then
-                                               listnode7.add(pexprnode6)
-                                       end
-                                       var pexprnode5 = new ABlockExpr.init_ablockexpr(
-                                               listnode7
-                                       )
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode3,
-                                               tkwdonode4,
-                                               pexprnode5
-                                       )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(50), node_list)
        end
 init do end
 end
-private class ReduceAction339
+private class ReduceAction376
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwdonode4 = nodearraylist2
-                                       assert tkwdonode4 isa TKwdo
-                                       var listnode8 = new Array[Object]
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var listnode7 = nodearraylist5 
-                                       assert listnode7 isa Array[Object]
-                                       if pexprnode6 != null then
-                                               listnode8.add(pexprnode6)
-                                       end
-                                       if listnode7 != null then
-                                               if listnode8.is_empty then
-                                                       listnode8 = listnode7
-                                               else
-                                                       listnode8.append(listnode7)
-                                               end
-                                       end
-                                       var pexprnode5 = new ABlockExpr.init_ablockexpr(
-                                               listnode8
-                                       )
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode3,
-                                               tkwdonode4,
-                                               pexprnode5
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(50), node_list)
        end
 init do end
 end
-private class ReduceAction340
+private class ReduceAction377
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa TKwdo
-                                       var listnode8 = new Array[Object]
-                                       var pexprnode7 = nodearraylist5
-                                       assert pexprnode7 isa PExpr
-                                       if pexprnode7 != null then
-                                               listnode8.add(pexprnode7)
-                                       end
-                                       var pexprnode6 = new ABlockExpr.init_ablockexpr(
-                                               listnode8
-                                       )
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(50), node_list)
        end
 init do end
 end
-private class ReduceAction341
+private class ReduceAction378
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa TKwdo
-                                       var listnode9 = new Array[Object]
-                                       var pexprnode7 = nodearraylist5
-                                       assert pexprnode7 isa PExpr
-                                       var listnode8 = nodearraylist6 
-                                       assert listnode8 isa Array[Object]
-                                       if pexprnode7 != null then
-                                               listnode9.add(pexprnode7)
-                                       end
-                                       if listnode8 != null then
-                                               if listnode9.is_empty then
-                                                       listnode9 = listnode8
-                                               else
-                                                       listnode9.append(listnode8)
-                                               end
-                                       end
-                                       var pexprnode6 = new ABlockExpr.init_ablockexpr(
-                                               listnode9
-                                       )
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(50), node_list)
        end
 init do end
 end
-private class ReduceAction342
+private class ReduceAction379
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwdonode4 = nodearraylist2
-                                       assert tkwdonode4 isa TKwdo
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode3,
-                                               tkwdonode4,
-                                               null
-                                       )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(51), node_list)
        end
 init do end
 end
-private class ReduceAction343
+private class ReduceAction380
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa TKwdo
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode4,
-                                               tkwdonode5,
-                                               null
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(31), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(51), node_list)
        end
 init do end
 end
-private class ReduceAction344
+private class ReduceAction381
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               null,
-                                               null
+                                       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(32), node_list)
+                                       p.push(p.go_to(51), node_list)
+       end
+init do end
+end
+private class ReduceAction382
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(52), node_list)
        end
 init do end
 end
-private class ReduceAction345
+private class ReduceAction383
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
+                                       var listnode6 = new Array[Object]
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
                                                null,
-                                               null
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(32), node_list)
+                                       p.push(p.go_to(52), node_list)
        end
 init do end
 end
-private class ReduceAction346
+private class ReduceAction384
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               tassignnode5,
-                                               pexprnode6
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(32), node_list)
+                                       p.push(p.go_to(52), node_list)
        end
 init do end
 end
-private class ReduceAction347
+private class ReduceAction385
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa PType
-                                       var tassignnode5 = nodearraylist4
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(32), node_list)
+                                       p.push(p.go_to(52), node_list)
        end
 init do end
 end
-private class ReduceAction348
+private class ReduceAction386
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var tassignnode4 = nodearraylist5
-                                       assert tassignnode4 isa TAssign
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrAssignExpr.init_aattrassignexpr(
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                               tattridnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction349
+private class ReduceAction387
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var tassignnode4 = nodearraylist2
-                                       assert tassignnode4 isa TAssign
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrAssignExpr.init_aattrassignexpr(
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                               tattridnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction350
+private class ReduceAction388
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
+                                       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 listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var tassignnode6 = nodearraylist6
-                                       assert tassignnode6 isa TAssign
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallAssignExpr.init_acallassignexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction351
+private class ReduceAction389
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var tassignnode6 = nodearraylist3
-                                       assert tassignnode6 isa TAssign
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallAssignExpr.init_acallassignexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction352
+private class ReduceAction390
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode5 = new Array[Object]
+                                       var tkwsupernode3 = nodearraylist1
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               null,
+                                               tkwsupernode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(53), node_list)
+       end
+init do end
+end
+private class ReduceAction391
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
+                                       var listnode5 = new Array[Object]
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
                                                else
-                                                       listnode4.append(listnode3)
+                                                       listnode5.append(listnode4)
                                                end
-                                       end
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new ABraAssignExpr.init_abraassignexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               tassignnode5,
-                                               pexprnode6
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction353
+private class ReduceAction392
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var passignopnode4 = nodearraylist5
-                                       assert passignopnode4 isa PAssignOp
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrReassignExpr.init_aattrreassignexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                               tkwinitnode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction354
+private class ReduceAction393
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var passignopnode4 = nodearraylist2
-                                       assert passignopnode4 isa PAssignOp
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrReassignExpr.init_aattrreassignexpr(
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                               tkwinitnode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(53), node_list)
+       end
+init do end
+end
+private class ReduceAction394
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(53), node_list)
+       end
+init do end
+end
+private class ReduceAction395
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       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 listnode5 = nodearraylist7
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               tidnode4,
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction355
+private class ReduceAction396
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -15351,430 +15289,264 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var passignopnode6 = nodearraylist6
-                                       assert passignopnode6 isa PAssignOp
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallReassignExpr.init_acallreassignexpr(
+                                       var pexprnode2 = nodearraylist3
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist7
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ACrangeExpr = new ACrangeExpr.init_acrangeexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction356
+private class ReduceAction397
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var passignopnode6 = nodearraylist3
-                                       assert passignopnode6 isa PAssignOp
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallReassignExpr.init_acallreassignexpr(
+                                       var pexprnode2 = nodearraylist3
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist7
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOrangeExpr = new AOrangeExpr.init_aorangeexpr(
                                                pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction357
+private class ReduceAction398
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
                                                else
-                                                       listnode4.append(listnode3)
+                                                       listnode3.append(listnode2)
                                                end
-                                       end
-                                       var passignopnode5 = nodearraylist3
-                                       assert passignopnode5 isa PAssignOp
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new ABraReassignExpr.init_abrareassignexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               passignopnode5,
-                                               pexprnode6
+#                                      end
+                                       var pexprnode1: nullable AArrayExpr = new AArrayExpr.init_aarrayexpr(
+                                               listnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(33), node_list)
-       end
-init do end
-end
-private class ReduceAction358
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tpluseqnode2 = nodearraylist1
-                                       assert tpluseqnode2 isa TPluseq
-                                       var passignopnode1 = new APlusAssignOp.init_aplusassignop(
-                                               tpluseqnode2
-                                       )
-                                       node_list = passignopnode1
-                                       p.push(p.go_to(34), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction359
+private class ReduceAction399
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tminuseqnode2 = nodearraylist1
-                                       assert tminuseqnode2 isa TMinuseq
-                                       var passignopnode1 = new AMinusAssignOp.init_aminusassignop(
-                                               tminuseqnode2
+                                       var tkwselfnode2 = nodearraylist1
+                                       assert tkwselfnode2 isa nullable TKwself
+                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
+                                               tkwselfnode2
                                        )
-                                       node_list = passignopnode1
-                                       p.push(p.go_to(34), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction360
+private class ReduceAction400
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwdonode2 = nodearraylist1
-                                       assert tkwdonode2 isa TKwdo
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ADoExpr.init_adoexpr(
-                                               tkwdonode2,
-                                               pexprnode3
+                                       var tkwtruenode2 = nodearraylist1
+                                       assert tkwtruenode2 isa nullable TKwtrue
+                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
+                                               tkwtruenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(35), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction361
+private class ReduceAction401
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                       var tkwfalsenode2 = nodearraylist1
+                                       assert tkwfalsenode2 isa nullable TKwfalse
+                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
+                                               tkwfalsenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction362
+private class ReduceAction402
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               null
+                                       var tkwnullnode2 = nodearraylist1
+                                       assert tkwnullnode2 isa nullable TKwnull
+                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
+                                               tkwnullnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction363
+private class ReduceAction403
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var listnode6 = new Array[Object]
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
-                                       if pexprnode5 != null then
-                                               listnode6.add(pexprnode5)
-                                       end
-                                       var pexprnode4 = new ABlockExpr.init_ablockexpr(
-                                               listnode6
-                                       )
-                                       var pexprnode7 = nodearraylist9
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               pexprnode7
+                                       var tnumbernode2 = nodearraylist1
+                                       assert tnumbernode2 isa nullable TNumber
+                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
+                                               tnumbernode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction364
+private class ReduceAction404
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var listnode7 = new Array[Object]
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
-                                       var listnode6 = nodearraylist8 
-                                       assert listnode6 isa Array[Object]
-                                       if pexprnode5 != null then
-                                               listnode7.add(pexprnode5)
-                                       end
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode4 = new ABlockExpr.init_ablockexpr(
-                                               listnode7
-                                       )
-                                       var pexprnode8 = nodearraylist10
-                                       assert pexprnode8 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               pexprnode4,
-                                               pexprnode8
+                                       var tfloatnode2 = nodearraylist1
+                                       assert tfloatnode2 isa nullable TFloat
+                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
+                                               tfloatnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction365
+private class ReduceAction405
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               null,
-                                               pexprnode5
+                                       var tcharnode2 = nodearraylist1
+                                       assert tcharnode2 isa nullable TChar
+                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
+                                               tcharnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction366
+private class ReduceAction406
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               null,
-                                               pexprnode5
+                                       var tstringnode2 = nodearraylist1
+                                       assert tstringnode2 isa nullable TString
+                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
+                                               tstringnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(36), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction367
+private class ReduceAction407
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist2
-                                       assert pexprnode1 isa PExpr
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(37), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction368
+private class ReduceAction408
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       node_list = null
-                                       p.push(p.go_to(37), node_list)
+                                       var pexprnode1 = nodearraylist2
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction369
+private class ReduceAction409
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwhilenode2 = nodearraylist1
-                                       assert tkwwhilenode2 isa TKwwhile
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var tkwdonode4 = nodearraylist5
-                                       assert tkwdonode4 isa TKwdo
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AWhileExpr.init_awhileexpr(
-                                               tkwwhilenode2,
-                                               pexprnode3,
-                                               tkwdonode4,
-                                               pexprnode5
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var ptypenode4 = nodearraylist8
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               ptypenode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(38), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction370
+private class ReduceAction410
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -15785,1094 +15557,1255 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa TKwfor
-                                       var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa TId
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa PExpr
-                                       var tkwdonode5 = nodearraylist9
-                                       assert tkwdonode5 isa TKwdo
-                                       var pexprnode6 = nodearraylist10
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AForExpr.init_aforexpr(
-                                               tkwfornode2,
-                                               tidnode3,
-                                               pexprnode4,
-                                               tkwdonode5,
-                                               pexprnode6
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist8
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullnode5 = nodearraylist10
+                                       assert tkwnullnode5 isa nullable TKwnull
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(39), node_list)
+                                       p.push(p.go_to(53), node_list)
        end
 init do end
 end
-private class ReduceAction371
+private class ReduceAction411
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa TKwassert
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode1 = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
-                                               null,
-                                               pexprnode4
+                                       var listnode4 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+#                                      if listnode2 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode2
+                                               else
+                                                       listnode4.append(listnode2)
+                                               end
+#                                      end
+                                       if pexprnode3 != null then
+                                               listnode4.add(pexprnode3)
+                                       end
+                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
+                                               listnode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(40), node_list)
+                                       p.push(p.go_to(54), node_list)
        end
 init do end
 end
-private class ReduceAction372
+private class ReduceAction412
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa TKwassert
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
+                                       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 PExpr
-                                       var pexprnode1 = new AAssertExpr.init_aassertexpr(
-                                               tkwassertnode2,
-                                               tidnode3,
-                                               pexprnode4
+                                       assert pexprnode4 isa nullable AExpr
+#                                      if listnode2 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode2
+                                               else
+                                                       listnode5.append(listnode2)
+                                               end
+#                                      end
+#                                      if listnode3 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode3
+                                               else
+                                                       listnode5.append(listnode3)
+                                               end
+#                                      end
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
+                                       end
+                                       var pexprnode1: nullable ASuperstringExpr = new ASuperstringExpr.init_asuperstringexpr(
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(40), node_list)
+                                       p.push(p.go_to(54), node_list)
        end
 init do end
 end
-private class ReduceAction373
+private class ReduceAction413
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert tidnode1 isa TId
-                                       node_list = tidnode1
-                                       p.push(p.go_to(41), node_list)
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       var pexprnode2 = nodearraylist3
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       node_list = listnode3
+                                       p.push(p.go_to(55), node_list)
        end
 init do end
 end
-private class ReduceAction374
+private class ReduceAction414
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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(42), node_list)
+                                       p.push(p.go_to(56), node_list)
        end
 init do end
 end
-private class ReduceAction375
+private class ReduceAction415
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 listnode7 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       var pexprnode2 = nodearraylist3
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
                                        end
-                                       var listnode6 = nodearraylist6 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
                                        end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
+                                       node_list = listnode3
+                                       p.push(p.go_to(57), node_list)
+       end
+init do end
+end
+private class ReduceAction416
+special 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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(42), node_list)
+                                       p.push(p.go_to(58), node_list)
        end
 init do end
 end
-private class ReduceAction376
+private class ReduceAction417
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tendstringnode2 = nodearraylist1
+                                       assert tendstringnode2 isa nullable TEndString
+                                       var pexprnode1: nullable AEndStringExpr = new AEndStringExpr.init_aendstringexpr(
+                                               tendstringnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(59), node_list)
+       end
+init do end
+end
+private class ReduceAction418
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(60), node_list)
+       end
+init do end
+end
+private class ReduceAction419
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       var listnode2 = nodearraylist5
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
                                        end
-                                       var listnode6 = nodearraylist3 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
                                                else
-                                                       listnode7.append(listnode6)
+                                                       listnode3.append(listnode2)
                                                end
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(60), node_list)
+       end
+init do end
+end
+private class ReduceAction420
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(60), node_list)
+       end
+init do end
+end
+private class ReduceAction421
+special 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(60), node_list)
+       end
+init do end
+end
+private class ReduceAction422
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
                                        end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(42), node_list)
+                                       node_list = listnode2
+                                       p.push(p.go_to(61), node_list)
        end
 init do end
 end
-private class ReduceAction377
+private class ReduceAction423
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       var listnode2 = nodearraylist5
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
                                        end
-                                       var listnode5 = nodearraylist3 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
                                                else
-                                                       listnode6.append(listnode5)
+                                                       listnode3.append(listnode2)
                                                end
-                                       end
-                                       var pexprnode1 = new ABraExpr.init_abraexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               listnode6
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(42), node_list)
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(61), node_list)
        end
 init do end
 end
-private class ReduceAction378
+private class ReduceAction424
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(43), node_list)
+                                       assert pexprnode1 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(61), node_list)
        end
 init do end
 end
-private class ReduceAction379
+private class ReduceAction425
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var tkwthennode4 = nodearraylist5
-                                       assert tkwthennode4 isa TKwthen
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
-                                       var tkwelsenode6 = nodearraylist9
-                                       assert tkwelsenode6 isa TKwelse
-                                       var pexprnode7 = nodearraylist11
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new AIfexprExpr.init_aifexprexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               tkwthennode4,
-                                               pexprnode5,
-                                               tkwelsenode6,
-                                               pexprnode7
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(43), node_list)
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(61), node_list)
        end
 init do end
 end
-private class ReduceAction380
+private class ReduceAction426
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(44), node_list)
+                                       var node_list: nullable Object = null
+                                       var listnode1 = new Array[Object]
+                                       node_list = listnode1
+                                       p.push(p.go_to(61), node_list)
        end
 init do end
 end
-private class ReduceAction381
+private class ReduceAction427
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOrExpr.init_aorexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(44), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(62), node_list)
        end
 init do end
 end
-private class ReduceAction382
+private class ReduceAction428
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AAndExpr.init_aandexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(44), node_list)
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
+                                       var listnode2 = nodearraylist5
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(62), node_list)
        end
 init do end
 end
-private class ReduceAction383
+private class ReduceAction429
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
+                                       var pexprnode1 = nodearraylist3
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(45), node_list)
+                                       p.push(p.go_to(63), node_list)
        end
 init do end
 end
-private class ReduceAction384
+private class ReduceAction430
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnotnode2 = nodearraylist1
-                                       assert tkwnotnode2 isa TKwnot
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANotExpr.init_anotexpr(
-                                               tkwnotnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(45), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist2
+                                       assert listnode1 isa Array[Object]
+#                                      if listnode1 != null then
+                                               if listnode2.is_empty then
+                                                       listnode2 = listnode1
+                                               else
+                                                       listnode2.append(listnode1)
+                                               end
+#                                      end
+                                       node_list = listnode2
+                                       p.push(p.go_to(64), node_list)
        end
 init do end
 end
-private class ReduceAction385
+private class ReduceAction431
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+#                                      if listnode1 != null then
+                                               if listnode2.is_empty then
+                                                       listnode2 = listnode1
+                                               else
+                                                       listnode2.append(listnode1)
+                                               end
+#                                      end
+                                       node_list = listnode2
+                                       p.push(p.go_to(64), node_list)
        end
 init do end
 end
-private class ReduceAction386
+private class ReduceAction432
+special 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
+                                       assert tidnode1 isa nullable TId
+                                       if tidnode1 != null then
+                                               listnode2.add(tidnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(65), node_list)
+       end
+init do end
+end
+private class ReduceAction433
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEqExpr.init_aeqexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       var tidnode2 = nodearraylist5
+                                       assert tidnode2 isa nullable TId
+#                                      if listnode1 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode1
+                                               else
+                                                       listnode3.append(listnode1)
+                                               end
+#                                      end
+                                       if tidnode2 != null then
+                                               listnode3.add(tidnode2)
+                                       end
+                                       node_list = listnode3
+                                       p.push(p.go_to(65), node_list)
+       end
+init do end
+end
+private class ReduceAction434
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       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 = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       node_list = pqualifiednode1
+                                       p.push(p.go_to(66), node_list)
        end
 init do end
 end
-private class ReduceAction387
+private class ReduceAction435
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEeExpr.init_aeeexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var tclassidnode4 = nodearraylist2
+                                       assert tclassidnode4 isa nullable TClassid
+                                       var pqualifiednode1: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode3,
+                                               tclassidnode4
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       node_list = pqualifiednode1
+                                       p.push(p.go_to(66), node_list)
        end
 init do end
 end
-private class ReduceAction388
+private class ReduceAction436
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANeExpr.init_aneexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var pqualifiednode1: nullable AQualified = new AQualified.init_aqualified(
+                                               listnode3,
+                                               null
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       node_list = pqualifiednode1
+                                       p.push(p.go_to(66), node_list)
        end
 init do end
 end
-private class ReduceAction389
+private class ReduceAction437
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALtExpr.init_altexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       var tidnode1 = nodearraylist1
+                                       assert tidnode1 isa nullable TId
+                                       node_list = tidnode1
+                                       p.push(p.go_to(67), node_list)
        end
 init do end
 end
-private class ReduceAction390
+private class ReduceAction438
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALeExpr.init_aleexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       var tclassidnode1 = nodearraylist1
+                                       assert tclassidnode1 isa nullable TClassid
+                                       node_list = tclassidnode1
+                                       p.push(p.go_to(68), node_list)
        end
 init do end
 end
-private class ReduceAction391
+private class ReduceAction439
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGtExpr.init_agtexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       p.push(p.go_to(69), node_list)
        end
 init do end
 end
-private class ReduceAction392
+private class ReduceAction440
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGeExpr.init_ageexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       p.push(p.go_to(69), node_list)
        end
 init do end
 end
-private class ReduceAction393
+private class ReduceAction441
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarshipExpr.init_astarshipexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
+                                               listnode3
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       node_list = pdocnode1
+                                       p.push(p.go_to(70), node_list)
        end
 init do end
 end
-private class ReduceAction394
+private class ReduceAction442
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa PType
-                                       var pexprnode1 = new AIsaExpr.init_aisaexpr(
-                                               pexprnode2,
-                                               ptypenode3
+                                       var listnode3 = new Array[Object]
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
+                                               else
+                                                       listnode3.append(listnode2)
+                                               end
+#                                      end
+                                       var pdocnode1: nullable ADoc = new ADoc.init_adoc(
+                                               listnode3
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(46), node_list)
+                                       node_list = pdocnode1
+                                       p.push(p.go_to(70), node_list)
        end
 init do end
 end
-private class ReduceAction395
+private class ReduceAction443
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(47), node_list)
+                                       node_list = null
+                                       p.push(p.go_to(70), node_list)
        end
 init do end
 end
-private class ReduceAction396
+private class ReduceAction444
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APlusExpr.init_aplusexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(47), node_list)
+                                       var node_list: nullable Object = null
+                                       node_list = null
+                                       p.push(p.go_to(71), node_list)
        end
 init do end
 end
-private class ReduceAction397
+private class ReduceAction445
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AMinusExpr.init_aminusexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(47), node_list)
+                                       var pdocnode1 = nodearraylist1
+                                       assert pdocnode1 isa nullable ADoc
+                                       node_list = pdocnode1
+                                       p.push(p.go_to(71), node_list)
        end
 init do end
 end
-private class ReduceAction398
+private class ReduceAction446
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(48), node_list)
+                                       p.push(p.go_to(72), node_list)
        end
 init do end
 end
-private class ReduceAction399
+private class ReduceAction447
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarExpr.init_astarexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(48), node_list)
+                                       p.push(p.go_to(72), node_list)
        end
 init do end
 end
-private class ReduceAction400
+private class ReduceAction448
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ASlashExpr.init_aslashexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(48), node_list)
+                                       p.push(p.go_to(72), node_list)
        end
 init do end
 end
-private class ReduceAction401
+private class ReduceAction449
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APercentExpr.init_apercentexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(48), node_list)
+                                       var ppropdefnode1 = nodearraylist1
+                                       assert ppropdefnode1 isa nullable APropdef
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(73), node_list)
        end
 init do end
 end
-private class ReduceAction402
+private class ReduceAction450
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(49), node_list)
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction403
+private class ReduceAction451
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TMinus
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AUminusExpr.init_auminusexpr(
-                                               tminusnode2,
-                                               pexprnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(49), node_list)
+                                       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 pexprnode8 = nodearraylist8
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction404
+private class ReduceAction452
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwoncenode2 = nodearraylist1
-                                       assert tkwoncenode2 isa TKwonce
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOnceExpr.init_aonceexpr(
-                                               tkwoncenode2,
-                                               pexprnode3
+                                       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 pexprnode8 = nodearraylist7
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(49), node_list)
-       end
-init do end
-end
-private class ReduceAction405
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(50), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction406
+private class ReduceAction453
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var listnode5 = nodearraylist4 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
-                                               else
-                                                       listnode6.append(listnode5)
-                                               end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               null,
-                                               listnode6
+                                       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 pexprnode8 = nodearraylist8
+                                       assert pexprnode8 isa nullable AExpr
+                                       var ppropdefnode1: nullable AConcreteMethPropdef = new AConcreteMethPropdef.init_aconcretemethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pexprnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(50), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction407
+private class ReduceAction454
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       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(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               null
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction408
+private class ReduceAction455
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       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(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               null
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction409
+private class ReduceAction456
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                       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(
+                                               pdocnode2,
+                                               null,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               tstringnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction410
+private class ReduceAction457
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                       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(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               tstringnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(74), node_list)
        end
 init do end
 end
-private class ReduceAction411
+private class ReduceAction458
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
+                                       var listnode4 = new Array[Object]
+                                       var tclassidnode3 = nodearraylist1
+                                       assert tclassidnode3 isa nullable TClassid
+                                       var ptypenode1: nullable AType = new AType.init_atype(
                                                null,
-                                               tkwsupernode3,
-                                               listnode5
+                                               tclassidnode3,
+                                               listnode4
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(75), node_list)
        end
 init do end
 end
-private class ReduceAction412
+private class ReduceAction459
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
-                                       var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode3,
-                                               listnode5
+                                       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
                                        )
+                                       node_list = ptypenode1
+                                       p.push(p.go_to(75), node_list)
+       end
+init do end
+end
+private class ReduceAction460
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(76), node_list)
        end
 init do end
 end
-private class ReduceAction413
+private class ReduceAction461
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist5 
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+#                                      end
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(76), node_list)
        end
 init do end
 end
-private class ReduceAction414
+private class ReduceAction462
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist2 
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+#                                      end
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(76), node_list)
        end
 init do end
 end
-private class ReduceAction415
+private class ReduceAction463
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var pexprnode1 = new ABraExpr.init_abraexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               listnode5
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(77), node_list)
        end
 init do end
 end
-private class ReduceAction416
+private class ReduceAction464
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -16880,1126 +16813,1057 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var tidnode4 = nodearraylist6
-                                       assert tidnode4 isa TId
-                                       var listnode5 = nodearraylist7 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
-                                               else
-                                                       listnode6.append(listnode5)
-                                               end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               tidnode4,
-                                               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 = 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 = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(77), node_list)
        end
 init do end
 end
-private class ReduceAction417
+private class ReduceAction465
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist3
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist7
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ACrangeExpr.init_acrangeexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(78), node_list)
        end
 init do end
 end
-private class ReduceAction418
+private class ReduceAction466
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist9 = p.pop
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist3
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist7
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOrangeExpr.init_aorangeexpr(
+                                       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
-                                       p.push(p.go_to(51), node_list)
-       end
-init do end
-end
-private class ReduceAction419
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       var pexprnode1 = new AArrayExpr.init_aarrayexpr(
-                                               listnode3
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
-       end
-init do end
-end
-private class ReduceAction420
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa TKwself
-                                       var pexprnode1 = new ASelfExpr.init_aselfexpr(
-                                               tkwselfnode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
-       end
-init do end
-end
-private class ReduceAction421
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa TKwtrue
-                                       var pexprnode1 = new ATrueExpr.init_atrueexpr(
-                                               tkwtruenode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
-       end
-init do end
-end
-private class ReduceAction422
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa TKwfalse
-                                       var pexprnode1 = new AFalseExpr.init_afalseexpr(
-                                               tkwfalsenode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(78), node_list)
        end
 init do end
 end
-private class ReduceAction423
+private class ReduceAction467
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa TKwnull
-                                       var pexprnode1 = new ANullExpr.init_anullexpr(
-                                               tkwnullnode2
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(78), node_list)
        end
 init do end
 end
-private class ReduceAction424
+private class ReduceAction468
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa TNumber
-                                       var pexprnode1 = new AIntExpr.init_aintexpr(
-                                               tnumbernode2
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(79), node_list)
        end
 init do end
 end
-private class ReduceAction425
+private class ReduceAction469
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa TFloat
-                                       var pexprnode1 = new AFloatExpr.init_afloatexpr(
-                                               tfloatnode2
+                                       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 = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(79), node_list)
        end
 init do end
 end
-private class ReduceAction426
+private class ReduceAction470
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tcharnode2 = nodearraylist1
-                                       assert tcharnode2 isa TChar
-                                       var pexprnode1 = new ACharExpr.init_acharexpr(
-                                               tcharnode2
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction427
+private class ReduceAction471
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa TString
-                                       var pexprnode1 = new AStringExpr.init_astringexpr(
-                                               tstringnode2
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
-       end
-init do end
-end
-private class ReduceAction428
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction429
+private class ReduceAction472
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction430
+private class ReduceAction473
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 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 PExpr
-                                       var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa TKwas
-                                       var ptypenode4 = nodearraylist8
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AAsCastExpr.init_aascastexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
                                                pexprnode2,
-                                               tkwasnode3,
-                                               ptypenode4
+                                               pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(51), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction431
+private class ReduceAction474
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       if listnode2 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode2
-                                               else
-                                                       listnode4.append(listnode2)
-                                               end
-                                       end
-                                       if pexprnode3 != null then
-                                               listnode4.add(pexprnode3)
-                                       end
-                                       var pexprnode1 = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode4
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(52), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction432
+private class ReduceAction475
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa PExpr
-                                       if listnode2 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode2
-                                               else
-                                                       listnode5.append(listnode2)
-                                               end
-                                       end
-                                       if listnode3 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode3
-                                               else
-                                                       listnode5.append(listnode3)
-                                               end
-                                       end
-                                       if pexprnode4 != null then
-                                               listnode5.add(pexprnode4)
-                                       end
-                                       var pexprnode1 = new ASuperstringExpr.init_asuperstringexpr(
-                                               listnode5
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(52), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction433
+private class ReduceAction476
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       var pexprnode2 = nodearraylist3
-                                       assert pexprnode2 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(53), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction434
+private class ReduceAction477
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tstartstringnode2 = nodearraylist1
-                                       assert tstartstringnode2 isa TStartString
-                                       var pexprnode1 = new AStartStringExpr.init_astartstringexpr(
-                                               tstartstringnode2
+                                       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
-                                       p.push(p.go_to(54), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction435
+private class ReduceAction478
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       var pexprnode2 = nodearraylist3
-                                       assert pexprnode2 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(55), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction436
+private class ReduceAction479
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tmidstringnode2 = nodearraylist1
-                                       assert tmidstringnode2 isa TMidString
-                                       var pexprnode1 = new AMidStringExpr.init_amidstringexpr(
-                                               tmidstringnode2
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(56), node_list)
+                                       p.push(p.go_to(80), node_list)
        end
 init do end
 end
-private class ReduceAction437
+private class ReduceAction480
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tendstringnode2 = nodearraylist1
-                                       assert tendstringnode2 isa TEndString
-                                       var pexprnode1 = new AEndStringExpr.init_aendstringexpr(
-                                               tendstringnode2
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(57), node_list)
+                                       p.push(p.go_to(81), node_list)
        end
 init do end
 end
-private class ReduceAction438
+private class ReduceAction481
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(58), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(81), node_list)
        end
 init do end
 end
-private class ReduceAction439
+private class ReduceAction482
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       var listnode2 = nodearraylist5 
-                                       assert listnode2 isa Array[Object]
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(58), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(81), node_list)
        end
 init do end
 end
-private class ReduceAction440
+private class ReduceAction483
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode1 = new Array[Object]
-                                       node_list = listnode1
-                                       p.push(p.go_to(58), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(82), node_list)
        end
 init do end
 end
-private class ReduceAction441
+private class ReduceAction484
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var listnode1 = new Array[Object]
-                                       node_list = listnode1
-                                       p.push(p.go_to(58), node_list)
+                                       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 AStarExpr = new AStarExpr.init_astarexpr(
+                                               pexprnode2,
+                                               pexprnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(82), node_list)
        end
 init do end
 end
-private class ReduceAction442
+private class ReduceAction485
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(59), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(82), node_list)
        end
 init do end
 end
-private class ReduceAction443
+private class ReduceAction486
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       var listnode2 = nodearraylist5 
-                                       assert listnode2 isa Array[Object]
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(59), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(82), node_list)
        end
 init do end
 end
-private class ReduceAction444
+private class ReduceAction487
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(59), node_list)
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(83), node_list)
        end
 init do end
 end
-private class ReduceAction445
+private class ReduceAction488
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode1 = new Array[Object]
-                                       node_list = listnode1
-                                       p.push(p.go_to(59), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(83), node_list)
        end
 init do end
 end
-private class ReduceAction446
+private class ReduceAction489
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var listnode1 = new Array[Object]
-                                       node_list = listnode1
-                                       p.push(p.go_to(59), node_list)
+                                       var node_list: nullable Object = null
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(83), node_list)
        end
 init do end
 end
-private class ReduceAction447
+private class ReduceAction490
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(60), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(84), node_list)
        end
 init do end
 end
-private class ReduceAction448
+private class ReduceAction491
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
-                                       var listnode2 = nodearraylist5 
-                                       assert listnode2 isa Array[Object]
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var listnode6 = new Array[Object]
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode6.append(listnode5)
                                                end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(60), node_list)
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               null,
+                                               listnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(84), node_list)
        end
 init do end
 end
-private class ReduceAction449
+private class ReduceAction492
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist3
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(61), node_list)
+                                       p.push(p.go_to(84), node_list)
        end
 init do end
 end
-private class ReduceAction450
+private class ReduceAction493
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var tidnode1 = nodearraylist1
-                                       assert tidnode1 isa TId
-                                       if tidnode1 != null then
-                                               listnode2.add(tidnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(62), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(84), node_list)
        end
 init do end
 end
-private class ReduceAction451
+private class ReduceAction494
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist5 = p.pop
+                                       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 listnode1 = nodearraylist1 
-                                       assert listnode1 isa Array[Object]
-                                       var tidnode2 = nodearraylist5
-                                       assert tidnode2 isa TId
-                                       if listnode1 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode1
-                                               else
-                                                       listnode3.append(listnode1)
-                                               end
-                                       end
-                                       if tidnode2 != null then
-                                               listnode3.add(tidnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(62), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction452
+private class ReduceAction495
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var tclassidnode3 = nodearraylist1
-                                       assert tclassidnode3 isa TClassid
-                                       var pqualifiednode1 = new AQualified.init_aqualified(
-                                               listnode2,
-                                               tclassidnode3
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       node_list = pqualifiednode1
-                                       p.push(p.go_to(63), node_list)
+                                       var tattridnode3 = nodearraylist1
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
+                                               pexprnode2,
+                                               tattridnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction453
+private class ReduceAction496
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode5.append(listnode4)
                                                end
-                                       end
-                                       var tclassidnode4 = nodearraylist2
-                                       assert tclassidnode4 isa TClassid
-                                       var pqualifiednode1 = new AQualified.init_aqualified(
-                                               listnode3,
-                                               tclassidnode4
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
                                        )
-                                       node_list = pqualifiednode1
-                                       p.push(p.go_to(63), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction454
+private class ReduceAction497
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pqualifiednode1 = new AQualified.init_aqualified(
-                                               listnode3,
-                                               null
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
                                        )
-                                       node_list = pqualifiednode1
-                                       p.push(p.go_to(63), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction455
+private class ReduceAction498
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tidnode1 = nodearraylist1
-                                       assert tidnode1 isa TId
-                                       node_list = tidnode1
-                                       p.push(p.go_to(64), node_list)
+                                       var listnode5 = new Array[Object]
+                                       var tkwsupernode3 = nodearraylist1
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               null,
+                                               tkwsupernode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction456
+private class ReduceAction499
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tclassidnode1 = nodearraylist1
-                                       assert tclassidnode1 isa TClassid
-                                       node_list = tclassidnode1
-                                       p.push(p.go_to(65), node_list)
-       end
-init do end
-end
-private class ReduceAction457
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       p.push(p.go_to(66), node_list)
+                                       var listnode5 = new Array[Object]
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction458
+private class ReduceAction500
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       p.push(p.go_to(66), node_list)
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               listnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction459
+private class ReduceAction501
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist1 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pdocnode1 = new ADoc.init_adoc(
-                                               listnode3
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               listnode5
                                        )
-                                       node_list = pdocnode1
-                                       p.push(p.go_to(67), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction460
+private class ReduceAction502
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = nodearraylist2 
-                                       assert listnode2 isa Array[Object]
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
+                                       var listnode6 = new Array[Object]
+                                       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 listnode5 = nodearraylist7
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
                                                else
-                                                       listnode3.append(listnode2)
+                                                       listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pdocnode1 = new ADoc.init_adoc(
-                                               listnode3
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               tidnode4,
+                                               listnode6
                                        )
-                                       node_list = pdocnode1
-                                       p.push(p.go_to(67), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction461
+private class ReduceAction503
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       node_list = null
-                                       p.push(p.go_to(67), node_list)
+                                       var tkwselfnode2 = nodearraylist1
+                                       assert tkwselfnode2 isa nullable TKwself
+                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
+                                               tkwselfnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction462
+private class ReduceAction504
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       node_list = null
-                                       p.push(p.go_to(68), node_list)
+                                       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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction463
+private class ReduceAction505
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode1 = nodearraylist1
-                                       assert pdocnode1 isa PDoc
-                                       node_list = pdocnode1
-                                       p.push(p.go_to(68), node_list)
+                                       var tkwfalsenode2 = nodearraylist1
+                                       assert tkwfalsenode2 isa nullable TKwfalse
+                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
+                                               tkwfalsenode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction464
+private class ReduceAction506
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       p.push(p.go_to(69), node_list)
+                                       var tkwnullnode2 = nodearraylist1
+                                       assert tkwnullnode2 isa nullable TKwnull
+                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
+                                               tkwnullnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction465
+private class ReduceAction507
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       p.push(p.go_to(69), node_list)
+                                       var tnumbernode2 = nodearraylist1
+                                       assert tnumbernode2 isa nullable TNumber
+                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
+                                               tnumbernode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction466
+private class ReduceAction508
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       p.push(p.go_to(69), node_list)
+                                       var tfloatnode2 = nodearraylist1
+                                       assert tfloatnode2 isa nullable TFloat
+                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
+                                               tfloatnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction467
+private class ReduceAction509
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var ppropdefnode1 = nodearraylist1
-                                       assert ppropdefnode1 isa PPropdef
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(70), node_list)
+                                       var tcharnode2 = nodearraylist1
+                                       assert tcharnode2 isa nullable TChar
+                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
+                                               tcharnode2
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction468
+private class ReduceAction510
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       var tstringnode2 = nodearraylist1
+                                       assert tstringnode2 isa nullable TString
+                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
+                                               tstringnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction469
+private class ReduceAction511
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction470
+private class ReduceAction512
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist7
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
-                                       )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       var pexprnode1 = nodearraylist2
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction471
+private class ReduceAction513
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -18009,39 +17873,32 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var pexprnode8 = nodearraylist8
-                                       assert pexprnode8 isa PExpr
-                                       var ppropdefnode1 = new AConcreteMethPropdef.init_aconcretemethpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               pexprnode8
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var ptypenode4 = nodearraylist8
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               ptypenode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction472
+private class ReduceAction514
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -18049,1105 +17906,1129 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist8
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullnode5 = nodearraylist10
+                                       assert tkwnullnode5 isa nullable TKwnull
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullnode5
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(85), node_list)
        end
 init do end
 end
-private class ReduceAction473
+private class ReduceAction515
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               null
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode2 = nodearraylist2
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
+                                       end
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode3
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(86), node_list)
        end
 init do end
 end
-private class ReduceAction474
+private class ReduceAction516
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist8 = p.pop
-                                       var nodearraylist7 = p.pop
-                                       var nodearraylist6 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var pvisibilitynode4 = nodearraylist2
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist3
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist4
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist5
-                                       assert psignaturenode7 isa PSignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa TString
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
-                                               pdocnode2,
-                                               null,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist2
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       if pexprnode2 != null then
+                                               listnode4.add(pexprnode2)
+                                       end
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(86), node_list)
        end
 init do end
 end
-private class ReduceAction475
+private class ReduceAction517
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode2 = nodearraylist1
-                                       assert pdocnode2 isa PDoc
-                                       var tkwredefnode3 = nodearraylist2
-                                       assert tkwredefnode3 isa TKwredef
-                                       var pvisibilitynode4 = nodearraylist3
-                                       assert pvisibilitynode4 isa PVisibility
-                                       var tkwmethnode5 = nodearraylist4
-                                       assert tkwmethnode5 isa TKwmeth
-                                       var pmethidnode6 = nodearraylist5
-                                       assert pmethidnode6 isa PMethid
-                                       var psignaturenode7 = nodearraylist6
-                                       assert psignaturenode7 isa PSignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa TString
-                                       var ppropdefnode1 = new AExternMethPropdef.init_aexternmethpropdef(
-                                               pdocnode2,
-                                               tkwredefnode3,
-                                               pvisibilitynode4,
-                                               tkwmethnode5,
-                                               pmethidnode6,
-                                               psignaturenode7,
-                                               tstringnode8
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2
                                        )
-                                       node_list = ppropdefnode1
-                                       p.push(p.go_to(71), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(86), node_list)
        end
 init do end
 end
-private class ReduceAction476
+private class ReduceAction518
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tclassidnode2 = nodearraylist1
-                                       assert tclassidnode2 isa TClassid
-                                       var ptypenode1 = new AType.init_atype(
-                                               tclassidnode2,
-                                               listnode3
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode2
                                        )
-                                       node_list = ptypenode1
-                                       p.push(p.go_to(72), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(86), node_list)
        end
 init do end
 end
-private class ReduceAction477
+private class ReduceAction519
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(73), node_list)
+                                       p.push(p.go_to(86), node_list)
        end
 init do end
 end
-private class ReduceAction478
+private class ReduceAction520
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var listnode6 = nodearraylist6 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(73), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction479
+private class ReduceAction521
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var listnode6 = nodearraylist3 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(73), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction480
+private class ReduceAction522
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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(74), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction481
+private class ReduceAction523
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: 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 node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var tkwthennode4 = nodearraylist5
-                                       assert tkwthennode4 isa TKwthen
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
-                                       var tkwelsenode6 = nodearraylist9
-                                       assert tkwelsenode6 isa TKwelse
-                                       var pexprnode7 = nodearraylist11
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new AIfexprExpr.init_aifexprexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
-                                               tkwthennode4,
-                                               pexprnode5,
-                                               tkwelsenode6,
-                                               pexprnode7
+                                       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(74), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction482
+private class ReduceAction524
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
+                                               tkwbreaknode2,
+                                               null,
+                                               null
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(75), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction483
+private class ReduceAction525
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOrExpr.init_aorexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(75), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction484
+private class ReduceAction526
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AAndExpr.init_aandexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var tkwbreaknode2 = nodearraylist1
+                                       assert tkwbreaknode2 isa nullable TKwbreak
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
+                                               tkwbreaknode2,
+                                               null,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(75), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction485
+private class ReduceAction527
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(76), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction486
+private class ReduceAction528
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwnotnode2 = nodearraylist1
-                                       assert tkwnotnode2 isa TKwnot
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANotExpr.init_anotexpr(
-                                               tkwnotnode2,
-                                               pexprnode3
+                                       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(76), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction487
+private class ReduceAction529
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null,
+                                               null
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction488
+private class ReduceAction530
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEqExpr.init_aeqexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var plabelnode3 = nodearraylist2
+                                       assert plabelnode3 isa nullable ALabel
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               plabelnode3,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction489
+private class ReduceAction531
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEeExpr.init_aeeexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode4 = nodearraylist2
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null,
+                                               pexprnode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction490
+private class ReduceAction532
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANeExpr.init_aneexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction491
+private class ReduceAction533
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALtExpr.init_altexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction492
+private class ReduceAction534
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALeExpr.init_aleexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction493
+private class ReduceAction535
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGtExpr.init_agtexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction494
+private class ReduceAction536
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGeExpr.init_ageexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction495
+private class ReduceAction537
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarshipExpr.init_astarshipexpr(
-                                               pexprnode2,
-                                               pexprnode3
-                                       )
+                                       var pexprnode1 = nodearraylist1
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction496
+private class ReduceAction538
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa PType
-                                       var pexprnode1 = new AIsaExpr.init_aisaexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               ptypenode3
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(77), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction497
+private class ReduceAction539
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               listnode6
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(78), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction498
+private class ReduceAction540
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APlusExpr.init_aplusexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist6
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               pexprnode3
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(78), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction499
+private class ReduceAction541
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AMinusExpr.init_aminusexpr(
+                                       var listnode5 = new Array[Object]
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var listnode6 = nodearraylist3
+                                       assert listnode6 isa Array[Object]
+#                                      if listnode6 != null then
+                                               if listnode7.is_empty then
+                                                       listnode7 = listnode6
+                                               else
+                                                       listnode7.append(listnode6)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
-                                               pexprnode3
+                                               tidnode3,
+                                               listnode5,
+                                               listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(78), node_list)
-       end
-init do end
-end
-private class ReduceAction500
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(79), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction501
+private class ReduceAction542
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarExpr.init_astarexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode5 = new Array[Object]
+                                       var tkwsupernode3 = nodearraylist1
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               null,
+                                               tkwsupernode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(79), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction502
+private class ReduceAction543
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ASlashExpr.init_aslashexpr(
-                                               pexprnode2,
-                                               pexprnode3
+                                       var listnode5 = new Array[Object]
+                                       var pqualifiednode2 = nodearraylist1
+                                       assert pqualifiednode2 isa nullable AQualified
+                                       var tkwsupernode3 = nodearraylist2
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
+                                               pqualifiednode2,
+                                               tkwsupernode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(79), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction503
+private class ReduceAction544
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APercentExpr.init_apercentexpr(
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwinitnode3 = nodearraylist4
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
-                                               pexprnode3
+                                               tkwinitnode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(79), node_list)
-       end
-init do end
-end
-private class ReduceAction504
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(80), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction505
+private class ReduceAction545
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa TMinus
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AUminusExpr.init_auminusexpr(
-                                               tminusnode2,
-                                               pexprnode3
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(80), node_list)
-       end
-init do end
-end
-private class ReduceAction506
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tkwoncenode2 = nodearraylist1
-                                       assert tkwoncenode2 isa TKwonce
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOnceExpr.init_aonceexpr(
-                                               tkwoncenode2,
-                                               pexprnode3
+                                       var tkwinitnode3 = nodearraylist1
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
+                                               pexprnode2,
+                                               tkwinitnode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(80), node_list)
+                                       p.push(p.go_to(87), node_list)
        end
 init do end
 end
-private class ReduceAction507
+private class ReduceAction546
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(81), node_list)
+                                       var listnode2 = new Array[Object]
+                                       var pclosuredefnode1 = nodearraylist1
+                                       assert pclosuredefnode1 isa nullable AClosureDef
+                                       if pclosuredefnode1 != null then
+                                               listnode2.add(pclosuredefnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(88), node_list)
        end
 init do end
 end
-private class ReduceAction508
+private class ReduceAction547
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var listnode5 = nodearraylist4 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
+                                       var listnode3 = new Array[Object]
+                                       var pclosuredefnode1 = nodearraylist1
+                                       assert pclosuredefnode1 isa nullable AClosureDef
+                                       var listnode2 = nodearraylist2
+                                       assert listnode2 isa Array[Object]
+                                       if pclosuredefnode1 != null then
+                                               listnode3.add(pclosuredefnode1)
+                                       end
+#                                      if listnode2 != null then
+                                               if listnode3.is_empty then
+                                                       listnode3 = listnode2
                                                else
-                                                       listnode6.append(listnode5)
+                                                       listnode3.append(listnode2)
                                                end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               null,
-                                               listnode6
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(81), node_list)
+#                                      end
+                                       node_list = listnode3
+                                       p.push(p.go_to(88), node_list)
        end
 init do end
 end
-private class ReduceAction509
+private class ReduceAction548
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction510
+private class ReduceAction549
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       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 listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
-                                               pexprnode2,
-                                               tattridnode3
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction511
+private class ReduceAction550
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction512
+private class ReduceAction551
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode6
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction513
+private class ReduceAction552
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
+                                       var tbangnode2 = nodearraylist1
+                                       assert tbangnode2 isa nullable TBang
+                                       var pclosureidnode3 = nodearraylist2
+                                       assert pclosureidnode3 isa nullable AClosureId
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
                                        end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               null,
-                                               tkwsupernode3,
-                                               listnode5
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction514
+private class ReduceAction553
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
-                                       var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
+                                       var tbangnode2 = nodearraylist1
+                                       assert tbangnode2 isa nullable TBang
+                                       var pclosureidnode3 = nodearraylist2
+                                       assert pclosureidnode3 isa nullable AClosureId
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode10 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       if pexprnode8 != null then
+                                               listnode10.add(pexprnode8)
                                        end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode3,
-                                               listnode5
+#                                      if listnode9 != null then
+                                               if listnode10.is_empty then
+                                                       listnode10 = listnode9
+                                               else
+                                                       listnode10.append(listnode9)
+                                               end
+#                                      end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode10
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction515
+private class ReduceAction554
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist5 
+                                       var tbangnode2 = nodearraylist1
+                                       assert tbangnode2 isa nullable TBang
+                                       var pclosureidnode3 = nodearraylist2
+                                       assert pclosureidnode3 isa nullable AClosureId
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction516
+private class ReduceAction555
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
-                                       )
-                                       var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist2 
+                                       var tbangnode2 = nodearraylist1
+                                       assert tbangnode2 isa nullable TBang
+                                       var pclosureidnode3 = nodearraylist2
+                                       assert pclosureidnode3 isa nullable AClosureId
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction517
+private class ReduceAction556
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -19155,195 +19036,169 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var tidnode4 = nodearraylist6
-                                       assert tidnode4 isa TId
-                                       var listnode5 = nodearraylist7 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
-                                               else
-                                                       listnode6.append(listnode5)
-                                               end
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
                                        end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               tidnode4,
-                                               listnode6
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction518
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa TKwself
-                                       var pexprnode1 = new ASelfExpr.init_aselfexpr(
-                                               tkwselfnode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction519
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa TKwtrue
-                                       var pexprnode1 = new ATrueExpr.init_atrueexpr(
-                                               tkwtruenode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction520
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa TKwfalse
-                                       var pexprnode1 = new AFalseExpr.init_afalseexpr(
-                                               tkwfalsenode2
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction521
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa TKwnull
-                                       var pexprnode1 = new ANullExpr.init_anullexpr(
-                                               tkwnullnode2
+                                       var plabelnode9 = nodearraylist8
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode9
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction522
+private class ReduceAction557
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa TNumber
-                                       var pexprnode1 = new AIntExpr.init_aintexpr(
-                                               tnumbernode2
+                                       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 listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist5
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist6
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction523
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa TFloat
-                                       var pexprnode1 = new AFloatExpr.init_afloatexpr(
-                                               tfloatnode2
+                                       var plabelnode10 = nodearraylist9
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode10
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction524
+private class ReduceAction558
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TChar
-                                       var pexprnode1 = new ACharExpr.init_acharexpr(
-                                               tcharnode2
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction525
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa TString
-                                       var pexprnode1 = new AStringExpr.init_astringexpr(
-                                               tstringnode2
+                                       var plabelnode8 = nodearraylist6
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction526
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction527
+private class ReduceAction559
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist2
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist5
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction528
+private class ReduceAction560
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist10 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -19353,904 +19208,1301 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa TKwas
-                                       var ptypenode4 = nodearraylist8
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AAsCastExpr.init_aascastexpr(
-                                               pexprnode2,
-                                               tkwasnode3,
-                                               ptypenode4
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       if pexprnode8 != null then
+                                               listnode9.add(pexprnode8)
+                                       end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(82), node_list)
-       end
-init do end
-end
-private class ReduceAction529
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(83), node_list)
+                                       var plabelnode10 = nodearraylist9
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode10
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction530
+private class ReduceAction561
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode3 = new Array[Object]
-                                       var pexprnode2 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       if pexprnode2 != null then
-                                               listnode3.add(pexprnode2)
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode10 = new Array[Object]
+                                       var pexprnode8 = nodearraylist6
+                                       assert pexprnode8 isa nullable AExpr
+                                       var listnode9 = nodearraylist7
+                                       assert listnode9 isa Array[Object]
+                                       if pexprnode8 != null then
+                                               listnode10.add(pexprnode8)
                                        end
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode3
+#                                      if listnode9 != null then
+                                               if listnode10.is_empty then
+                                                       listnode10 = listnode9
+                                               else
+                                                       listnode10.append(listnode9)
+                                               end
+#                                      end
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode10
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(83), node_list)
+                                       var plabelnode11 = nodearraylist10
+                                       assert plabelnode11 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode11
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction531
+private class ReduceAction562
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist3 
-                                       assert listnode3 isa Array[Object]
-                                       if pexprnode2 != null then
-                                               listnode4.add(pexprnode2)
-                                       end
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
                                                else
-                                                       listnode4.append(listnode3)
+                                                       listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode4
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(83), node_list)
+                                       var plabelnode9 = nodearraylist7
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode9
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction532
+private class ReduceAction563
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode2 = new Array[Object]
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode2
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tkwdonode6 = nodearraylist4
+                                       assert tkwdonode6 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(83), node_list)
-       end
-init do end
-end
-private class ReduceAction533
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = new ABlockExpr.init_ablockexpr(
-                                               listnode2
+                                       var plabelnode9 = nodearraylist6
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pclosuredefnode1: nullable AClosureDef = new AClosureDef.init_aclosuredef(
+                                               tbangnode2,
+                                               pclosureidnode3,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               plabelnode9
                                        )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(83), node_list)
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction534
+private class ReduceAction564
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       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,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction535
+private class ReduceAction565
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       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]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       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,
+                                               listnode5,
+                                               tkwdonode6,
+                                               pexprnode7,
+                                               null
+                                       )
+                                       node_list = pclosuredefnode1
+                                       p.push(p.go_to(89), node_list)
        end
 init do end
 end
-private class ReduceAction536
+private class ReduceAction566
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreturnnode2 = nodearraylist1
-                                       assert tkwreturnnode2 isa TKwreturn
-                                       var pexprnode1 = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(90), node_list)
        end
 init do end
 end
-private class ReduceAction537
+private class ReduceAction567
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwreturnnode2 = nodearraylist1
-                                       assert tkwreturnnode2 isa TKwreturn
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AReturnExpr.init_areturnexpr(
-                                               tkwreturnnode2,
-                                               pexprnode3
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(90), node_list)
        end
 init do end
 end
-private class ReduceAction538
+private class ReduceAction568
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwbreak
-                                       var pexprnode1 = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               null
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(90), node_list)
        end
 init do end
 end
-private class ReduceAction539
+private class ReduceAction569
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwbreak
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               pexprnode3
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(90), node_list)
        end
 init do end
 end
-private class ReduceAction540
+private class ReduceAction570
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwabortnode2 = nodearraylist1
-                                       assert tkwabortnode2 isa TKwabort
-                                       var pexprnode1 = new AAbortExpr.init_aabortexpr(
-                                               tkwabortnode2
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction541
+private class ReduceAction571
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa TKwcontinue
-                                       var pexprnode1 = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction542
+private class ReduceAction572
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwcontinue
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               pexprnode3
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tidnode3 = nodearraylist4
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tassignnode6 = nodearraylist6
+                                       assert tassignnode6 isa nullable TAssign
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               tassignnode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
-       end
-init do end
-end
-private class ReduceAction543
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction544
+private class ReduceAction573
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       )
+                                       var tidnode3 = nodearraylist1
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
+                                       assert listnode4 isa Array[Object]
+#                                      if listnode4 != null then
+                                               if listnode5.is_empty then
+                                                       listnode5 = listnode4
+                                               else
+                                                       listnode5.append(listnode4)
+                                               end
+#                                      end
+                                       var tassignnode6 = nodearraylist3
+                                       assert tassignnode6 isa nullable TAssign
+                                       var pexprnode7 = nodearraylist4
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
+                                               pexprnode2,
+                                               tidnode3,
+                                               listnode5,
+                                               tassignnode6,
+                                               pexprnode7
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction545
+private class ReduceAction574
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
-                                       assert pexprnode1 isa PExpr
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
+                                               else
+                                                       listnode4.append(listnode3)
+                                               end
+#                                      end
+                                       var tassignnode5 = nodearraylist3
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable ABraAssignExpr = new ABraAssignExpr.init_abraassignexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               tassignnode5,
+                                               pexprnode6
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction546
+private class ReduceAction575
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction547
+private class ReduceAction576
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction548
+private class ReduceAction577
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var passignopnode6 = nodearraylist6
+                                       assert passignopnode6 isa nullable AAssignOp
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
-                                               listnode6
+                                               passignopnode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction549
+private class ReduceAction578
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode6 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var passignopnode6 = nodearraylist3
+                                       assert passignopnode6 isa nullable AAssignOp
+                                       var pexprnode7 = nodearraylist4
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
-                                               listnode6
+                                               passignopnode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(91), node_list)
        end
 init do end
 end
-private class ReduceAction550
+private class ReduceAction579
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
+                                       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 listnode7 = new Array[Object]
+                                       var listnode4 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
+                                       assert listnode3 isa Array[Object]
+#                                      if listnode3 != null then
+                                               if listnode4.is_empty then
+                                                       listnode4 = listnode3
                                                else
-                                                       listnode5.append(listnode4)
+                                                       listnode4.append(listnode3)
                                                end
+#                                      end
+                                       var passignopnode5 = nodearraylist3
+                                       assert passignopnode5 isa nullable AAssignOp
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable ABraReassignExpr = new ABraReassignExpr.init_abrareassignexpr(
+                                               pexprnode2,
+                                               listnode4,
+                                               passignopnode5,
+                                               pexprnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(91), node_list)
+       end
+init do end
+end
+private class ReduceAction580
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode5 = new Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
                                        end
-                                       var listnode6 = nodearraylist6 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode5
+                                       )
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(92), node_list)
+       end
+init do end
+end
+private class ReduceAction581
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist6 = p.pop
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       if pexprnode4 != null then
+                                               listnode6.add(pexprnode4)
+                                       end
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
                                                else
-                                                       listnode7.append(listnode6)
+                                                       listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
+#                                      end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction551
+private class ReduceAction582
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var listnode6 = nodearraylist3 
-                                       assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
-                                               if listnode7.is_empty then
-                                                       listnode7 = listnode6
-                                               else
-                                                       listnode7.append(listnode6)
-                                               end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               listnode7
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction552
+private class ReduceAction583
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               null,
-                                               tkwsupernode3,
-                                               listnode5
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
+                                       )
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction553
+private class ReduceAction584
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 listnode5 = new Array[Object]
-                                       var pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
-                                       var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       if pexprnode4 != null then
+                                               listnode5.add(pexprnode4)
                                        end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
-                                               pqualifiednode2,
-                                               tkwsupernode3,
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
                                                listnode5
                                        )
+                                       var plabelnode6 = nodearraylist6
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode6
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction554
+private class ReduceAction585
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode6 = new Array[Object]
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       if pexprnode4 != null then
+                                               listnode6.add(pexprnode4)
+                                       end
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
                                                else
-                                                       listnode5.append(listnode4)
+                                                       listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+#                                      end
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var plabelnode7 = nodearraylist7
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction555
+private class ReduceAction586
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
                                        )
-                                       var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
-                                               pexprnode2,
-                                               tkwinitnode3,
-                                               listnode5
+                                       var plabelnode5 = nodearraylist4
+                                       assert plabelnode5 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(84), node_list)
-       end
-init do end
-end
-private class ReduceAction556
-special ReduceAction
-       redef meth action(p: Parser)
-       do
-                                       var node_list: Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pclosuredefnode1 = nodearraylist1
-                                       assert pclosuredefnode1 isa PClosureDef
-                                       if pclosuredefnode1 != null then
-                                               listnode2.add(pclosuredefnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(85), node_list)
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction557
+private class ReduceAction587
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var pclosuredefnode1 = nodearraylist1
-                                       assert pclosuredefnode1 isa PClosureDef
-                                       var listnode2 = nodearraylist2 
-                                       assert listnode2 isa Array[Object]
-                                       if pclosuredefnode1 != null then
-                                               listnode3.add(pclosuredefnode1)
-                                       end
-                                       if listnode2 != null then
-                                               if listnode3.is_empty then
-                                                       listnode3 = listnode2
-                                               else
-                                                       listnode3.append(listnode2)
-                                               end
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(85), node_list)
+                                       var tkwdonode2 = nodearraylist1
+                                       assert tkwdonode2 isa nullable TKwdo
+                                       var listnode4 = new Array[Object]
+                                       var pexprnode3: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode4
+                                       )
+                                       var plabelnode5 = nodearraylist3
+                                       assert plabelnode5 isa nullable ALabel
+                                       var pexprnode1: nullable ADoExpr = new ADoExpr.init_adoexpr(
+                                               tkwdonode2,
+                                               pexprnode3,
+                                               plabelnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction558
+private class ReduceAction588
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var tkwdonode4 = nodearraylist2
-                                       assert tkwdonode4 isa TKwdo
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode3,
-                                               tkwdonode4,
-                                               pexprnode5
+                                       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 = pclosuredefnode1
-                                       p.push(p.go_to(86), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(92), node_list)
        end
 init do end
 end
-private class ReduceAction559
+private class ReduceAction589
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwithnode2 = nodearraylist1
-                                       assert tkwwithnode2 isa TKwwith
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tkwdonode5 = nodearraylist3
-                                       assert tkwdonode5 isa TKwdo
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pclosuredefnode1 = new AClosureDef.init_aclosuredef(
-                                               tkwwithnode2,
-                                               listnode4,
-                                               tkwdonode5,
-                                               pexprnode6
+                                       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
                                        )
-                                       node_list = pclosuredefnode1
-                                       p.push(p.go_to(86), node_list)
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(93), node_list)
        end
 init do end
 end
-private class ReduceAction560
+private class ReduceAction590
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwvarnode2 = nodearraylist1
-                                       assert tkwvarnode2 isa TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               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 listnode7 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       if pexprnode6 != null then
+                                               listnode7.add(pexprnode6)
+                                       end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
                                                null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(87), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction561
+private class ReduceAction591
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               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 listnode8 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var listnode7 = nodearraylist8
+                                       assert listnode7 isa Array[Object]
+                                       if pexprnode6 != null then
+                                               listnode8.add(pexprnode6)
+                                       end
+#                                      if listnode7 != null then
+                                               if listnode8.is_empty then
+                                                       listnode8 = listnode7
+                                               else
+                                                       listnode8.append(listnode7)
+                                               end
+#                                      end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
                                                null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(87), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction562
+private class ReduceAction592
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist5
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               null,
-                                               tassignnode5,
-                                               pexprnode6
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(87), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction563
+private class ReduceAction593
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 TKwvar
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var ptypenode4 = nodearraylist3
-                                       assert ptypenode4 isa PType
-                                       var tassignnode5 = nodearraylist4
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist6
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AVardeclExpr.init_avardeclexpr(
-                                               tkwvarnode2,
-                                               tidnode3,
-                                               ptypenode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(87), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction564
+private class ReduceAction594
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var tassignnode4 = nodearraylist5
-                                       assert tassignnode4 isa TAssign
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       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 listnode7 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       if pexprnode6 != null then
+                                               listnode7.add(pexprnode6)
+                                       end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist10
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode8
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction565
+private class ReduceAction595
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       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 listnode8 = new Array[Object]
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var listnode7 = nodearraylist8
+                                       assert listnode7 isa Array[Object]
+                                       if pexprnode6 != null then
+                                               listnode8.add(pexprnode6)
+                                       end
+#                                      if listnode7 != null then
+                                               if listnode8.is_empty then
+                                                       listnode8 = listnode7
+                                               else
+                                                       listnode8.append(listnode7)
+                                               end
+#                                      end
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
                                        )
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var tassignnode4 = nodearraylist2
-                                       assert tassignnode4 isa TAssign
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrAssignExpr.init_aattrassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               tassignnode4,
-                                               pexprnode5
+                                       var plabelnode9 = nodearraylist11
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode9
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction566
+private class ReduceAction596
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -20258,173 +20510,212 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var tassignnode6 = nodearraylist6
-                                       assert tassignnode6 isa TAssign
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
+                                       )
+                                       var plabelnode7 = nodearraylist8
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction567
+private class ReduceAction597
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       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 listnode6 = new Array[Object]
+                                       var pexprnode5: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode6
                                        )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var tassignnode6 = nodearraylist3
-                                       assert tassignnode6 isa TAssign
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallAssignExpr.init_acallassignexpr(
-                                               pexprnode2,
-                                               tidnode3,
-                                               listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                       var plabelnode7 = nodearraylist7
+                                       assert plabelnode7 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction568
+private class ReduceAction598
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
-                                       end
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa TAssign
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new ABraAssignExpr.init_abraassignexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(94), node_list)
        end
 init do end
 end
-private class ReduceAction569
+private class ReduceAction599
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var passignopnode4 = nodearraylist5
-                                       assert passignopnode4 isa PAssignOp
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
+                                       end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction570
+private class ReduceAction600
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist12
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
                                        )
-                                       var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var passignopnode4 = nodearraylist2
-                                       assert passignopnode4 isa PAssignOp
-                                       var pexprnode5 = nodearraylist3
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AAttrReassignExpr.init_aattrreassignexpr(
-                                               pexprnode2,
-                                               tattridnode3,
-                                               passignopnode4,
-                                               pexprnode5
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction571
+private class ReduceAction601
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -20432,136 +20723,192 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var passignopnode6 = nodearraylist6
-                                       assert passignopnode6 isa PAssignOp
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
                                                tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction572
+private class ReduceAction602
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
                                        )
-                                       var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
-                                       assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
-                                               if listnode5.is_empty then
-                                                       listnode5 = listnode4
-                                               else
-                                                       listnode5.append(listnode4)
-                                               end
-                                       end
-                                       var passignopnode6 = nodearraylist3
-                                       assert passignopnode6 isa PAssignOp
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new ACallReassignExpr.init_acallreassignexpr(
-                                               pexprnode2,
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
                                                tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction573
+private class ReduceAction603
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
                                        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 PExpr
-                                       var listnode3 = nodearraylist2 
-                                       assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
-                                               if listnode4.is_empty then
-                                                       listnode4 = listnode3
-                                               else
-                                                       listnode4.append(listnode3)
-                                               end
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode8 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       if pexprnode7 != null then
+                                               listnode8.add(pexprnode7)
                                        end
-                                       var passignopnode5 = nodearraylist3
-                                       assert passignopnode5 isa PAssignOp
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new ABraReassignExpr.init_abrareassignexpr(
-                                               pexprnode2,
-                                               listnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode8
+                                       )
+                                       var plabelnode9 = nodearraylist14
+                                       assert plabelnode9 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode9
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(88), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction574
+private class ReduceAction604
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwdonode2 = nodearraylist1
-                                       assert tkwdonode2 isa TKwdo
-                                       var pexprnode3 = nodearraylist2
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ADoExpr.init_adoexpr(
-                                               tkwdonode2,
-                                               pexprnode3
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode9 = new Array[Object]
+                                       var pexprnode7 = nodearraylist11
+                                       assert pexprnode7 isa nullable AExpr
+                                       var listnode8 = nodearraylist12
+                                       assert listnode8 isa Array[Object]
+                                       if pexprnode7 != null then
+                                               listnode9.add(pexprnode7)
+                                       end
+#                                      if listnode8 != null then
+                                               if listnode9.is_empty then
+                                                       listnode9 = listnode8
+                                               else
+                                                       listnode9.append(listnode8)
+                                               end
+#                                      end
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode9
+                                       )
+                                       var plabelnode10 = nodearraylist15
+                                       assert plabelnode10 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode10
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(89), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction575
+private class ReduceAction605
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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
@@ -20570,60 +20917,81 @@ special ReduceAction
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode5 = nodearraylist8
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AIfExpr.init_aifexpr(
-                                               tkwifnode2,
-                                               pexprnode3,
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist12
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
                                                pexprnode4,
-                                               pexprnode5
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(90), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction576
+private class ReduceAction606
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwwhilenode2 = nodearraylist1
-                                       assert tkwwhilenode2 isa TKwwhile
-                                       var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var tkwdonode4 = nodearraylist5
-                                       assert tkwdonode4 isa TKwdo
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa PExpr
-                                       var pexprnode1 = new AWhileExpr.init_awhileexpr(
-                                               tkwwhilenode2,
-                                               pexprnode3,
-                                               tkwdonode4,
-                                               pexprnode5
+                                       var tkwfornode2 = nodearraylist1
+                                       assert tkwfornode2 isa nullable TKwfor
+                                       var tidnode3 = nodearraylist3
+                                       assert tidnode3 isa nullable TId
+                                       var pexprnode4 = nodearraylist7
+                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwdonode5 = nodearraylist9
+                                       assert tkwdonode5 isa nullable TKwdo
+                                       var listnode7 = new Array[Object]
+                                       var pexprnode6: nullable ABlockExpr = new ABlockExpr.init_ablockexpr(
+                                               listnode7
+                                       )
+                                       var plabelnode8 = nodearraylist11
+                                       assert plabelnode8 isa nullable ALabel
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
+                                               tkwfornode2,
+                                               tidnode3,
+                                               pexprnode4,
+                                               tkwdonode5,
+                                               pexprnode6,
+                                               plabelnode8
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(91), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction577
+private class ReduceAction607
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -20635,90 +21003,91 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwfornode2 = nodearraylist1
-                                       assert tkwfornode2 isa TKwfor
+                                       assert tkwfornode2 isa nullable TKwfor
                                        var tidnode3 = nodearraylist3
-                                       assert tidnode3 isa TId
+                                       assert tidnode3 isa nullable TId
                                        var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa PExpr
+                                       assert pexprnode4 isa nullable AExpr
                                        var tkwdonode5 = nodearraylist9
-                                       assert tkwdonode5 isa TKwdo
+                                       assert tkwdonode5 isa nullable TKwdo
                                        var pexprnode6 = nodearraylist10
-                                       assert pexprnode6 isa PExpr
-                                       var pexprnode1 = new AForExpr.init_aforexpr(
+                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
                                                tkwfornode2,
                                                tidnode3,
                                                pexprnode4,
                                                tkwdonode5,
-                                               pexprnode6
+                                               pexprnode6,
+                                               null
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(92), node_list)
+                                       p.push(p.go_to(95), node_list)
        end
 init do end
 end
-private class ReduceAction578
+private class ReduceAction608
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa TKwassert
+                                       assert tkwassertnode2 isa nullable TKwassert
                                        var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode1 = new AAssertExpr.init_aassertexpr(
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
                                                tkwassertnode2,
                                                null,
                                                pexprnode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(93), node_list)
+                                       p.push(p.go_to(96), node_list)
        end
 init do end
 end
-private class ReduceAction579
+private class ReduceAction609
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwassertnode2 = nodearraylist1
-                                       assert tkwassertnode2 isa TKwassert
+                                       assert tkwassertnode2 isa nullable TKwassert
                                        var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
+                                       assert tidnode3 isa nullable TId
                                        var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa PExpr
-                                       var pexprnode1 = new AAssertExpr.init_aassertexpr(
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
                                                tkwassertnode2,
                                                tidnode3,
                                                pexprnode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(93), node_list)
+                                       p.push(p.go_to(96), node_list)
        end
 init do end
 end
-private class ReduceAction580
+private class ReduceAction610
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(94), node_list)
+                                       p.push(p.go_to(97), node_list)
        end
 init do end
 end
-private class ReduceAction581
+private class ReduceAction611
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -20728,139 +21097,139 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(94), node_list)
+                                       p.push(p.go_to(97), node_list)
        end
 init do end
 end
-private class ReduceAction582
+private class ReduceAction612
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(94), node_list)
+                                       p.push(p.go_to(97), node_list)
        end
 init do end
 end
-private class ReduceAction583
+private class ReduceAction613
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
-                                       var listnode3 = nodearraylist2 
+                                       assert pexprnode2 isa nullable AExpr
+                                       var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
-                                       if listnode3 != null then
+#                                      if listnode3 != null then
                                                if listnode4.is_empty then
                                                        listnode4 = listnode3
                                                else
                                                        listnode4.append(listnode3)
                                                end
-                                       end
-                                       var listnode5 = nodearraylist3 
+#                                      end
+                                       var listnode5 = nodearraylist3
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new ABraExpr.init_abraexpr(
+#                                      end
+                                       var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
                                                pexprnode2,
                                                listnode4,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(94), node_list)
+                                       p.push(p.go_to(97), node_list)
        end
 init do end
 end
-private class ReduceAction584
+private class ReduceAction614
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(95), node_list)
+                                       p.push(p.go_to(98), node_list)
        end
 init do end
 end
-private class ReduceAction585
+private class ReduceAction615
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -20870,99 +21239,99 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(95), node_list)
+                                       p.push(p.go_to(98), node_list)
        end
 init do end
 end
-private class ReduceAction586
+private class ReduceAction616
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(95), node_list)
+                                       p.push(p.go_to(98), node_list)
        end
 init do end
 end
-private class ReduceAction587
+private class ReduceAction617
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(96), node_list)
+                                       p.push(p.go_to(99), node_list)
        end
 init do end
 end
-private class ReduceAction588
+private class ReduceAction618
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -20972,99 +21341,99 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(96), node_list)
+                                       p.push(p.go_to(99), node_list)
        end
 init do end
 end
-private class ReduceAction589
+private class ReduceAction619
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(96), node_list)
+                                       p.push(p.go_to(99), node_list)
        end
 init do end
 end
-private class ReduceAction590
+private class ReduceAction620
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(97), node_list)
+                                       p.push(p.go_to(100), node_list)
        end
 init do end
 end
-private class ReduceAction591
+private class ReduceAction621
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -21077,18 +21446,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
+                                       assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
+                                       assert pexprnode3 isa nullable AExpr
                                        var tkwthennode4 = nodearraylist5
-                                       assert tkwthennode4 isa TKwthen
+                                       assert tkwthennode4 isa nullable TKwthen
                                        var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
+                                       assert pexprnode5 isa nullable AExpr
                                        var tkwelsenode6 = nodearraylist9
-                                       assert tkwelsenode6 isa TKwelse
+                                       assert tkwelsenode6 isa nullable TKwelse
                                        var pexprnode7 = nodearraylist11
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new AIfexprExpr.init_aifexprexpr(
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfexprExpr = new AIfexprExpr.init_aifexprexpr(
                                                tkwifnode2,
                                                pexprnode3,
                                                tkwthennode4,
@@ -21097,596 +21466,645 @@ special ReduceAction
                                                pexprnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(97), node_list)
+                                       p.push(p.go_to(100), node_list)
        end
 init do end
 end
-private class ReduceAction592
+private class ReduceAction622
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(98), node_list)
+                                       p.push(p.go_to(101), node_list)
        end
 init do end
 end
-private class ReduceAction593
+private class ReduceAction623
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOrExpr.init_aorexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOrExpr = new AOrExpr.init_aorexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(98), node_list)
+                                       p.push(p.go_to(101), node_list)
        end
 init do end
 end
-private class ReduceAction594
+private class ReduceAction624
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AAndExpr.init_aandexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AAndExpr = new AAndExpr.init_aandexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(98), node_list)
+                                       p.push(p.go_to(101), node_list)
        end
 init do end
 end
-private class ReduceAction595
+private class ReduceAction625
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(99), node_list)
+                                       p.push(p.go_to(102), node_list)
        end
 init do end
 end
-private class ReduceAction596
+private class ReduceAction626
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwnotnode2 = nodearraylist1
-                                       assert tkwnotnode2 isa TKwnot
+                                       assert tkwnotnode2 isa nullable TKwnot
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANotExpr.init_anotexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANotExpr = new ANotExpr.init_anotexpr(
                                                tkwnotnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(99), node_list)
+                                       p.push(p.go_to(102), node_list)
        end
 init do end
 end
-private class ReduceAction597
+private class ReduceAction627
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction598
+private class ReduceAction628
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEqExpr.init_aeqexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AEqExpr = new AEqExpr.init_aeqexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction599
+private class ReduceAction629
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEeExpr.init_aeeexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AEeExpr = new AEeExpr.init_aeeexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction600
+private class ReduceAction630
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANeExpr.init_aneexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction601
+private class ReduceAction631
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALtExpr.init_altexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALtExpr = new ALtExpr.init_altexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction602
+private class ReduceAction632
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALeExpr.init_aleexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALeExpr = new ALeExpr.init_aleexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction603
+private class ReduceAction633
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGtExpr.init_agtexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGtExpr = new AGtExpr.init_agtexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction604
+private class ReduceAction634
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGeExpr.init_ageexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGeExpr = new AGeExpr.init_ageexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction605
+private class ReduceAction635
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarshipExpr.init_astarshipexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AStarshipExpr = new AStarshipExpr.init_astarshipexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction606
+private class ReduceAction636
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa PType
-                                       var pexprnode1 = new AIsaExpr.init_aisaexpr(
+                                       assert ptypenode3 isa nullable AType
+                                       var pexprnode1: nullable AIsaExpr = new AIsaExpr.init_aisaexpr(
                                                pexprnode2,
                                                ptypenode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(100), node_list)
+                                       p.push(p.go_to(103), node_list)
        end
 init do end
 end
-private class ReduceAction607
+private class ReduceAction637
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(101), node_list)
+                                       p.push(p.go_to(104), node_list)
        end
 init do end
 end
-private class ReduceAction608
+private class ReduceAction638
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APlusExpr.init_aplusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable APlusExpr = new APlusExpr.init_aplusexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(101), node_list)
+                                       p.push(p.go_to(104), node_list)
        end
 init do end
 end
-private class ReduceAction609
+private class ReduceAction639
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AMinusExpr.init_aminusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AMinusExpr = new AMinusExpr.init_aminusexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(101), node_list)
+                                       p.push(p.go_to(104), node_list)
        end
 init do end
 end
-private class ReduceAction610
+private class ReduceAction640
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(102), node_list)
+                                       p.push(p.go_to(105), node_list)
        end
 init do end
 end
-private class ReduceAction611
+private class ReduceAction641
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarExpr.init_astarexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AStarExpr = new AStarExpr.init_astarexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(102), node_list)
+                                       p.push(p.go_to(105), node_list)
        end
 init do end
 end
-private class ReduceAction612
+private class ReduceAction642
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ASlashExpr.init_aslashexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ASlashExpr = new ASlashExpr.init_aslashexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(102), node_list)
+                                       p.push(p.go_to(105), node_list)
        end
 init do end
 end
-private class ReduceAction613
+private class ReduceAction643
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APercentExpr.init_apercentexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable APercentExpr = new APercentExpr.init_apercentexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(102), node_list)
+                                       p.push(p.go_to(105), node_list)
        end
 init do end
 end
-private class ReduceAction614
+private class ReduceAction644
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(103), node_list)
+                                       p.push(p.go_to(106), node_list)
        end
 init do end
 end
-private class ReduceAction615
+private class ReduceAction645
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa TMinus
+                                       assert tminusnode2 isa nullable TMinus
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AUminusExpr.init_auminusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AUminusExpr = new AUminusExpr.init_auminusexpr(
                                                tminusnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(103), node_list)
+                                       p.push(p.go_to(106), node_list)
        end
 init do end
 end
-private class ReduceAction616
+private class ReduceAction646
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwoncenode2 = nodearraylist1
-                                       assert tkwoncenode2 isa TKwonce
+                                       assert tkwoncenode2 isa nullable TKwonce
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOnceExpr.init_aonceexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOnceExpr = new AOnceExpr.init_aonceexpr(
                                                tkwoncenode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(103), node_list)
+                                       p.push(p.go_to(106), node_list)
        end
 init do end
 end
-private class ReduceAction617
+private class ReduceAction647
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(107), node_list)
+       end
+init do end
+end
+private class ReduceAction648
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode6 = new Array[Object]
+                                       var tkwnewnode2 = nodearraylist1
+                                       assert tkwnewnode2 isa nullable TKwnew
+                                       var ptypenode3 = nodearraylist3
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+#                                      if listnode5 != null then
+                                               if listnode6.is_empty then
+                                                       listnode6 = listnode5
+                                               else
+                                                       listnode6.append(listnode5)
+                                               end
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
+                                               tkwnewnode2,
+                                               ptypenode3,
+                                               null,
+                                               listnode6
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(107), node_list)
+       end
+init do end
+end
+private class ReduceAction649
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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
+                                       )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(104), node_list)
+                                       p.push(p.go_to(107), node_list)
        end
 init do end
 end
-private class ReduceAction618
+private class ReduceAction650
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var nodearraylist4 = p.pop
-                                       var nodearraylist3 = p.pop
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
-                                       var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
-                                       var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var listnode5 = nodearraylist4 
-                                       assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
-                                               if listnode6.is_empty then
-                                                       listnode6 = listnode5
-                                               else
-                                                       listnode6.append(listnode5)
-                                               end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
-                                               tkwnewnode2,
-                                               ptypenode3,
-                                               null,
-                                               listnode6
+                                       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
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(104), node_list)
+                                       p.push(p.go_to(107), node_list)
        end
 init do end
 end
-private class ReduceAction619
+private class ReduceAction651
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tattridnode3 = nodearraylist4
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
                                                tattridnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction620
+private class ReduceAction652
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tattridnode3 = nodearraylist1
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
                                                tattridnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction621
+private class ReduceAction653
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -21695,128 +22113,128 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction622
+private class ReduceAction654
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction623
+private class ReduceAction655
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                null,
                                                tkwsupernode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction624
+private class ReduceAction656
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
+                                       assert pqualifiednode2 isa nullable AQualified
                                        var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                pqualifiednode2,
                                                tkwsupernode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction625
+private class ReduceAction657
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
@@ -21824,64 +22242,64 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tkwinitnode3 = nodearraylist4
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist5 
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction626
+private class ReduceAction658
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tkwinitnode3 = nodearraylist1
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist2 
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction627
+private class ReduceAction659
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -21891,177 +22309,177 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode6 = new Array[Object]
                                        var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
+                                       assert tkwnewnode2 isa nullable TKwnew
                                        var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
+                                       assert ptypenode3 isa nullable AType
                                        var tidnode4 = nodearraylist6
-                                       assert tidnode4 isa TId
-                                       var listnode5 = nodearraylist7 
+                                       assert tidnode4 isa nullable TId
+                                       var listnode5 = nodearraylist7
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
                                                tkwnewnode2,
                                                ptypenode3,
                                                tidnode4,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction628
+private class ReduceAction660
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa TKwself
-                                       var pexprnode1 = new ASelfExpr.init_aselfexpr(
+                                       assert tkwselfnode2 isa nullable TKwself
+                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
                                                tkwselfnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction629
+private class ReduceAction661
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa TKwtrue
-                                       var pexprnode1 = new ATrueExpr.init_atrueexpr(
+                                       assert tkwtruenode2 isa nullable TKwtrue
+                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
                                                tkwtruenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction630
+private class ReduceAction662
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa TKwfalse
-                                       var pexprnode1 = new AFalseExpr.init_afalseexpr(
+                                       assert tkwfalsenode2 isa nullable TKwfalse
+                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
                                                tkwfalsenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction631
+private class ReduceAction663
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa TKwnull
-                                       var pexprnode1 = new ANullExpr.init_anullexpr(
+                                       assert tkwnullnode2 isa nullable TKwnull
+                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
                                                tkwnullnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction632
+private class ReduceAction664
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa TNumber
-                                       var pexprnode1 = new AIntExpr.init_aintexpr(
+                                       assert tnumbernode2 isa nullable TNumber
+                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
                                                tnumbernode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction633
+private class ReduceAction665
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa TFloat
-                                       var pexprnode1 = new AFloatExpr.init_afloatexpr(
+                                       assert tfloatnode2 isa nullable TFloat
+                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
                                                tfloatnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction634
+private class ReduceAction666
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tcharnode2 = nodearraylist1
-                                       assert tcharnode2 isa TChar
-                                       var pexprnode1 = new ACharExpr.init_acharexpr(
+                                       assert tcharnode2 isa nullable TChar
+                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
                                                tcharnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction635
+private class ReduceAction667
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa TString
-                                       var pexprnode1 = new AStringExpr.init_astringexpr(
+                                       assert tstringnode2 isa nullable TString
+                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
                                                tstringnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction636
+private class ReduceAction668
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction637
+private class ReduceAction669
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -22073,39 +22491,75 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa TKwas
+                                       assert tkwasnode3 isa nullable TKwas
                                        var ptypenode4 = nodearraylist8
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AAsCastExpr.init_aascastexpr(
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
                                                pexprnode2,
                                                tkwasnode3,
                                                ptypenode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(105), node_list)
+                                       p.push(p.go_to(108), node_list)
        end
 init do end
 end
-private class ReduceAction638
+private class ReduceAction670
+special 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 pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist8
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullnode5 = nodearraylist10
+                                       assert tkwnullnode5 isa nullable TKwnull
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(108), node_list)
+       end
+init do end
+end
+private class ReduceAction671
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(106), node_list)
+                                       p.push(p.go_to(109), node_list)
        end
 init do end
 end
-private class ReduceAction639
+private class ReduceAction672
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -22115,99 +22569,99 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(106), node_list)
+                                       p.push(p.go_to(109), node_list)
        end
 init do end
 end
-private class ReduceAction640
+private class ReduceAction673
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(106), node_list)
+                                       p.push(p.go_to(109), node_list)
        end
 init do end
 end
-private class ReduceAction641
+private class ReduceAction674
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(107), node_list)
+                                       p.push(p.go_to(110), node_list)
        end
 init do end
 end
-private class ReduceAction642
+private class ReduceAction675
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -22220,18 +22674,18 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwifnode2 = nodearraylist1
-                                       assert tkwifnode2 isa TKwif
+                                       assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
+                                       assert pexprnode3 isa nullable AExpr
                                        var tkwthennode4 = nodearraylist5
-                                       assert tkwthennode4 isa TKwthen
+                                       assert tkwthennode4 isa nullable TKwthen
                                        var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa PExpr
+                                       assert pexprnode5 isa nullable AExpr
                                        var tkwelsenode6 = nodearraylist9
-                                       assert tkwelsenode6 isa TKwelse
+                                       assert tkwelsenode6 isa nullable TKwelse
                                        var pexprnode7 = nodearraylist11
-                                       assert pexprnode7 isa PExpr
-                                       var pexprnode1 = new AIfexprExpr.init_aifexprexpr(
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfexprExpr = new AIfexprExpr.init_aifexprexpr(
                                                tkwifnode2,
                                                pexprnode3,
                                                tkwthennode4,
@@ -22240,702 +22694,726 @@ special ReduceAction
                                                pexprnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(107), node_list)
+                                       p.push(p.go_to(110), node_list)
        end
 init do end
 end
-private class ReduceAction643
+private class ReduceAction676
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(108), node_list)
+                                       p.push(p.go_to(111), node_list)
        end
 init do end
 end
-private class ReduceAction644
+private class ReduceAction677
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOrExpr.init_aorexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOrExpr = new AOrExpr.init_aorexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(108), node_list)
+                                       p.push(p.go_to(111), node_list)
        end
 init do end
 end
-private class ReduceAction645
+private class ReduceAction678
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AAndExpr.init_aandexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AAndExpr = new AAndExpr.init_aandexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(108), node_list)
+                                       p.push(p.go_to(111), node_list)
        end
 init do end
 end
-private class ReduceAction646
+private class ReduceAction679
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(109), node_list)
+                                       p.push(p.go_to(112), node_list)
        end
 init do end
 end
-private class ReduceAction647
+private class ReduceAction680
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwnotnode2 = nodearraylist1
-                                       assert tkwnotnode2 isa TKwnot
+                                       assert tkwnotnode2 isa nullable TKwnot
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANotExpr.init_anotexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANotExpr = new ANotExpr.init_anotexpr(
                                                tkwnotnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(109), node_list)
+                                       p.push(p.go_to(112), node_list)
        end
 init do end
 end
-private class ReduceAction648
+private class ReduceAction681
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction649
+private class ReduceAction682
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEqExpr.init_aeqexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AEqExpr = new AEqExpr.init_aeqexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction650
+private class ReduceAction683
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AEeExpr.init_aeeexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AEeExpr = new AEeExpr.init_aeeexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction651
+private class ReduceAction684
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ANeExpr.init_aneexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ANeExpr = new ANeExpr.init_aneexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction652
+private class ReduceAction685
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALtExpr.init_altexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALtExpr = new ALtExpr.init_altexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction653
+private class ReduceAction686
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ALeExpr.init_aleexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALeExpr = new ALeExpr.init_aleexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction654
+private class ReduceAction687
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGtExpr.init_agtexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGtExpr = new AGtExpr.init_agtexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction655
+private class ReduceAction688
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AGeExpr.init_ageexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGeExpr = new AGeExpr.init_ageexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction656
+private class ReduceAction689
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarshipExpr.init_astarshipexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AStarshipExpr = new AStarshipExpr.init_astarshipexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction657
+private class ReduceAction690
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var ptypenode3 = nodearraylist4
-                                       assert ptypenode3 isa PType
-                                       var pexprnode1 = new AIsaExpr.init_aisaexpr(
+                                       assert ptypenode3 isa nullable AType
+                                       var pexprnode1: nullable AIsaExpr = new AIsaExpr.init_aisaexpr(
                                                pexprnode2,
                                                ptypenode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(110), node_list)
+                                       p.push(p.go_to(113), node_list)
        end
 init do end
 end
-private class ReduceAction658
+private class ReduceAction691
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(111), node_list)
+                                       p.push(p.go_to(114), node_list)
        end
 init do end
 end
-private class ReduceAction659
+private class ReduceAction692
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APlusExpr.init_aplusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable APlusExpr = new APlusExpr.init_aplusexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(111), node_list)
+                                       p.push(p.go_to(114), node_list)
        end
 init do end
 end
-private class ReduceAction660
+private class ReduceAction693
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AMinusExpr.init_aminusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AMinusExpr = new AMinusExpr.init_aminusexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(111), node_list)
+                                       p.push(p.go_to(114), node_list)
        end
 init do end
 end
-private class ReduceAction661
+private class ReduceAction694
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(112), node_list)
+                                       p.push(p.go_to(115), node_list)
        end
 init do end
 end
-private class ReduceAction662
+private class ReduceAction695
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AStarExpr.init_astarexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AStarExpr = new AStarExpr.init_astarexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(112), node_list)
+                                       p.push(p.go_to(115), node_list)
        end
 init do end
 end
-private class ReduceAction663
+private class ReduceAction696
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new ASlashExpr.init_aslashexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ASlashExpr = new ASlashExpr.init_aslashexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(112), node_list)
+                                       p.push(p.go_to(115), node_list)
        end
 init do end
 end
-private class ReduceAction664
+private class ReduceAction697
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var pexprnode3 = nodearraylist4
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new APercentExpr.init_apercentexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable APercentExpr = new APercentExpr.init_apercentexpr(
                                                pexprnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(112), node_list)
+                                       p.push(p.go_to(115), node_list)
        end
 init do end
 end
-private class ReduceAction665
+private class ReduceAction698
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(113), node_list)
+                                       p.push(p.go_to(116), node_list)
        end
 init do end
 end
-private class ReduceAction666
+private class ReduceAction699
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tminusnode2 = nodearraylist1
-                                       assert tminusnode2 isa TMinus
+                                       assert tminusnode2 isa nullable TMinus
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AUminusExpr.init_auminusexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AUminusExpr = new AUminusExpr.init_auminusexpr(
                                                tminusnode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(113), node_list)
+                                       p.push(p.go_to(116), node_list)
        end
 init do end
 end
-private class ReduceAction667
+private class ReduceAction700
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwoncenode2 = nodearraylist1
-                                       assert tkwoncenode2 isa TKwonce
+                                       assert tkwoncenode2 isa nullable TKwonce
                                        var pexprnode3 = nodearraylist3
-                                       assert pexprnode3 isa PExpr
-                                       var pexprnode1 = new AOnceExpr.init_aonceexpr(
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AOnceExpr = new AOnceExpr.init_aonceexpr(
                                                tkwoncenode2,
                                                pexprnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(113), node_list)
+                                       p.push(p.go_to(116), node_list)
        end
 init do end
 end
-private class ReduceAction668
+private class ReduceAction701
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(114), node_list)
+                                       p.push(p.go_to(117), node_list)
        end
 init do end
 end
-private class ReduceAction669
+private class ReduceAction702
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       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 tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
+                                       assert tkwnewnode2 isa nullable TKwnew
                                        var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
-                                       var listnode5 = nodearraylist4 
+                                       assert ptypenode3 isa nullable AType
+                                       var listnode5 = nodearraylist4
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
                                                tkwnewnode2,
                                                ptypenode3,
                                                null,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(114), node_list)
+                                       p.push(p.go_to(117), node_list)
        end
 init do end
 end
-private class ReduceAction670
+private class ReduceAction703
+special ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var 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
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(117), node_list)
+       end
+init do end
+end
+private class ReduceAction704
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tattridnode3 = nodearraylist2
-                                       assert tattridnode3 isa TAttrid
-                                       var pexprnode1 = new AAttrExpr.init_aattrexpr(
+                                       assert tattridnode3 isa nullable TAttrid
+                                       var pexprnode1: nullable AAttrExpr = new AAttrExpr.init_aattrexpr(
                                                pexprnode2,
                                                tattridnode3
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction671
+private class ReduceAction705
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist3 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction672
+private class ReduceAction706
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var tkwsupernode3 = nodearraylist1
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist2 
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                null,
                                                tkwsupernode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction673
+private class ReduceAction707
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var pqualifiednode2 = nodearraylist1
-                                       assert pqualifiednode2 isa PQualified
+                                       assert pqualifiednode2 isa nullable AQualified
                                        var tkwsupernode3 = nodearraylist2
-                                       assert tkwsupernode3 isa TKwsuper
-                                       var listnode4 = nodearraylist3 
+                                       assert tkwsupernode3 isa nullable TKwsuper
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new ASuperExpr.init_asuperexpr(
+#                                      end
+                                       var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                pqualifiednode2,
                                                tkwsupernode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction674
+private class ReduceAction708
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tkwinitnode3 = nodearraylist2
-                                       assert tkwinitnode3 isa TKwinit
-                                       var listnode4 = nodearraylist3 
+                                       assert tkwinitnode3 isa nullable TKwinit
+                                       var listnode4 = nodearraylist3
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var pexprnode1 = new AInitExpr.init_ainitexpr(
+#                                      end
+                                       var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
                                                listnode5
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction675
+private class ReduceAction709
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -22945,177 +23423,177 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode6 = new Array[Object]
                                        var tkwnewnode2 = nodearraylist1
-                                       assert tkwnewnode2 isa TKwnew
+                                       assert tkwnewnode2 isa nullable TKwnew
                                        var ptypenode3 = nodearraylist3
-                                       assert ptypenode3 isa PType
+                                       assert ptypenode3 isa nullable AType
                                        var tidnode4 = nodearraylist6
-                                       assert tidnode4 isa TId
-                                       var listnode5 = nodearraylist7 
+                                       assert tidnode4 isa nullable TId
+                                       var listnode5 = nodearraylist7
                                        assert listnode5 isa Array[Object]
-                                       if listnode5 != null then
+#                                      if listnode5 != null then
                                                if listnode6.is_empty then
                                                        listnode6 = listnode5
                                                else
                                                        listnode6.append(listnode5)
                                                end
-                                       end
-                                       var pexprnode1 = new ANewExpr.init_anewexpr(
+#                                      end
+                                       var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
                                                tkwnewnode2,
                                                ptypenode3,
                                                tidnode4,
                                                listnode6
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction676
+private class ReduceAction710
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwselfnode2 = nodearraylist1
-                                       assert tkwselfnode2 isa TKwself
-                                       var pexprnode1 = new ASelfExpr.init_aselfexpr(
+                                       assert tkwselfnode2 isa nullable TKwself
+                                       var pexprnode1: nullable ASelfExpr = new ASelfExpr.init_aselfexpr(
                                                tkwselfnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction677
+private class ReduceAction711
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwtruenode2 = nodearraylist1
-                                       assert tkwtruenode2 isa TKwtrue
-                                       var pexprnode1 = new ATrueExpr.init_atrueexpr(
+                                       assert tkwtruenode2 isa nullable TKwtrue
+                                       var pexprnode1: nullable ATrueExpr = new ATrueExpr.init_atrueexpr(
                                                tkwtruenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction678
+private class ReduceAction712
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwfalsenode2 = nodearraylist1
-                                       assert tkwfalsenode2 isa TKwfalse
-                                       var pexprnode1 = new AFalseExpr.init_afalseexpr(
+                                       assert tkwfalsenode2 isa nullable TKwfalse
+                                       var pexprnode1: nullable AFalseExpr = new AFalseExpr.init_afalseexpr(
                                                tkwfalsenode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction679
+private class ReduceAction713
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwnullnode2 = nodearraylist1
-                                       assert tkwnullnode2 isa TKwnull
-                                       var pexprnode1 = new ANullExpr.init_anullexpr(
+                                       assert tkwnullnode2 isa nullable TKwnull
+                                       var pexprnode1: nullable ANullExpr = new ANullExpr.init_anullexpr(
                                                tkwnullnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction680
+private class ReduceAction714
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tnumbernode2 = nodearraylist1
-                                       assert tnumbernode2 isa TNumber
-                                       var pexprnode1 = new AIntExpr.init_aintexpr(
+                                       assert tnumbernode2 isa nullable TNumber
+                                       var pexprnode1: nullable AIntExpr = new AIntExpr.init_aintexpr(
                                                tnumbernode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction681
+private class ReduceAction715
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tfloatnode2 = nodearraylist1
-                                       assert tfloatnode2 isa TFloat
-                                       var pexprnode1 = new AFloatExpr.init_afloatexpr(
+                                       assert tfloatnode2 isa nullable TFloat
+                                       var pexprnode1: nullable AFloatExpr = new AFloatExpr.init_afloatexpr(
                                                tfloatnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction682
+private class ReduceAction716
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tcharnode2 = nodearraylist1
-                                       assert tcharnode2 isa TChar
-                                       var pexprnode1 = new ACharExpr.init_acharexpr(
+                                       assert tcharnode2 isa nullable TChar
+                                       var pexprnode1: nullable ACharExpr = new ACharExpr.init_acharexpr(
                                                tcharnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction683
+private class ReduceAction717
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tstringnode2 = nodearraylist1
-                                       assert tstringnode2 isa TString
-                                       var pexprnode1 = new AStringExpr.init_astringexpr(
+                                       assert tstringnode2 isa nullable TString
+                                       var pexprnode1: nullable AStringExpr = new AStringExpr.init_astringexpr(
                                                tstringnode2
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction684
+private class ReduceAction718
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction685
+private class ReduceAction719
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
@@ -23127,66 +23605,102 @@ special ReduceAction
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tkwasnode3 = nodearraylist4
-                                       assert tkwasnode3 isa TKwas
+                                       assert tkwasnode3 isa nullable TKwas
                                        var ptypenode4 = nodearraylist8
-                                       assert ptypenode4 isa PType
-                                       var pexprnode1 = new AAsCastExpr.init_aascastexpr(
+                                       assert ptypenode4 isa nullable AType
+                                       var pexprnode1: nullable AAsCastExpr = new AAsCastExpr.init_aascastexpr(
                                                pexprnode2,
                                                tkwasnode3,
                                                ptypenode4
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(115), node_list)
+                                       p.push(p.go_to(118), node_list)
        end
 init do end
 end
-private class ReduceAction686
+private class ReduceAction720
+special 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 pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tkwasnode3 = nodearraylist4
+                                       assert tkwasnode3 isa nullable TKwas
+                                       var tkwnotnode4 = nodearraylist8
+                                       assert tkwnotnode4 isa nullable TKwnot
+                                       var tkwnullnode5 = nodearraylist10
+                                       assert tkwnullnode5 isa nullable TKwnull
+                                       var pexprnode1: nullable AAsNotnullExpr = new AAsNotnullExpr.init_aasnotnullexpr(
+                                               pexprnode2,
+                                               tkwasnode3,
+                                               tkwnotnode4,
+                                               tkwnullnode5
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(118), node_list)
+       end
+init do end
+end
+private class ReduceAction721
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(116), node_list)
+                                       p.push(p.go_to(119), node_list)
        end
 init do end
 end
-private class ReduceAction687
+private class ReduceAction722
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
-                                       var pexprnode1 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var node_list: nullable Object = null
+                                       var pexprnode1: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(116), node_list)
+                                       p.push(p.go_to(119), node_list)
        end
 init do end
 end
-private class ReduceAction688
+private class ReduceAction723
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(117), node_list)
+                                       p.push(p.go_to(120), node_list)
        end
 init do end
 end
-private class ReduceAction689
+private class ReduceAction724
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -23196,99 +23710,99 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(117), node_list)
+                                       p.push(p.go_to(120), node_list)
        end
 init do end
 end
-private class ReduceAction690
+private class ReduceAction725
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(117), node_list)
+                                       p.push(p.go_to(120), node_list)
        end
 init do end
 end
-private class ReduceAction691
+private class ReduceAction726
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        node_list = pexprnode1
-                                       p.push(p.go_to(118), node_list)
+                                       p.push(p.go_to(121), node_list)
        end
 init do end
 end
-private class ReduceAction692
+private class ReduceAction727
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -23298,746 +23812,746 @@ special ReduceAction
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
-                                       assert pexprnode2 isa PExpr
+                                       assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist5 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist5
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist6 
+#                                      end
+                                       var listnode6 = nodearraylist6
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(118), node_list)
+                                       p.push(p.go_to(121), node_list)
        end
 init do end
 end
-private class ReduceAction693
+private class ReduceAction728
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var pexprnode2 = new AImplicitSelfExpr.init_aimplicitselfexpr(
+                                       var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
-                                       assert tidnode3 isa TId
-                                       var listnode4 = nodearraylist2 
+                                       assert tidnode3 isa nullable TId
+                                       var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
-                                       if listnode4 != null then
+#                                      if listnode4 != null then
                                                if listnode5.is_empty then
                                                        listnode5 = listnode4
                                                else
                                                        listnode5.append(listnode4)
                                                end
-                                       end
-                                       var listnode6 = nodearraylist3 
+#                                      end
+                                       var listnode6 = nodearraylist3
                                        assert listnode6 isa Array[Object]
-                                       if listnode6 != null then
+#                                      if listnode6 != null then
                                                if listnode7.is_empty then
                                                        listnode7 = listnode6
                                                else
                                                        listnode7.append(listnode6)
                                                end
-                                       end
-                                       var pexprnode1 = new ACallExpr.init_acallexpr(
+#                                      end
+                                       var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
                                                listnode5,
                                                listnode7
                                        )
                                        node_list = pexprnode1
-                                       p.push(p.go_to(118), node_list)
+                                       p.push(p.go_to(121), node_list)
        end
 init do end
 end
-private class ReduceAction694
+private class ReduceAction729
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pimportnode1 = nodearraylist1
-                                       assert pimportnode1 isa PImport
+                                       assert pimportnode1 isa nullable AImport
                                        if pimportnode1 != null then
                                                listnode2.add(pimportnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(119), node_list)
+                                       p.push(p.go_to(122), node_list)
        end
 init do end
 end
-private class ReduceAction695
+private class ReduceAction730
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pimportnode2 = nodearraylist2
-                                       assert pimportnode2 isa PImport
-                                       if listnode1 != null then
+                                       assert pimportnode2 isa nullable AImport
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pimportnode2 != null then
                                                listnode3.add(pimportnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(119), node_list)
+                                       p.push(p.go_to(122), node_list)
        end
 init do end
 end
-private class ReduceAction696
+private class ReduceAction731
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pclassdefnode1 = nodearraylist1
-                                       assert pclassdefnode1 isa PClassdef
+                                       assert pclassdefnode1 isa nullable AClassdef
                                        if pclassdefnode1 != null then
                                                listnode2.add(pclassdefnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(120), node_list)
+                                       p.push(p.go_to(123), node_list)
        end
 init do end
 end
-private class ReduceAction697
+private class ReduceAction732
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pclassdefnode2 = nodearraylist2
-                                       assert pclassdefnode2 isa PClassdef
-                                       if listnode1 != null then
+                                       assert pclassdefnode2 isa nullable AClassdef
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pclassdefnode2 != null then
                                                listnode3.add(pclassdefnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(120), node_list)
+                                       p.push(p.go_to(123), node_list)
        end
 init do end
 end
-private class ReduceAction698
+private class ReduceAction733
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var psuperclassnode1 = nodearraylist1
-                                       assert psuperclassnode1 isa PSuperclass
+                                       assert psuperclassnode1 isa nullable ASuperclass
                                        if psuperclassnode1 != null then
                                                listnode2.add(psuperclassnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(121), node_list)
+                                       p.push(p.go_to(124), node_list)
        end
 init do end
 end
-private class ReduceAction699
+private class ReduceAction734
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var psuperclassnode2 = nodearraylist2
-                                       assert psuperclassnode2 isa PSuperclass
-                                       if listnode1 != null then
+                                       assert psuperclassnode2 isa nullable ASuperclass
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if psuperclassnode2 != null then
                                                listnode3.add(psuperclassnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(121), node_list)
+                                       p.push(p.go_to(124), node_list)
        end
 init do end
 end
-private class ReduceAction700
+private class ReduceAction735
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pformaldefnode1 = nodearraylist1
-                                       assert pformaldefnode1 isa PFormaldef
+                                       assert pformaldefnode1 isa nullable AFormaldef
                                        if pformaldefnode1 != null then
                                                listnode2.add(pformaldefnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(122), node_list)
+                                       p.push(p.go_to(125), node_list)
        end
 init do end
 end
-private class ReduceAction701
+private class ReduceAction736
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pformaldefnode2 = nodearraylist2
-                                       assert pformaldefnode2 isa PFormaldef
-                                       if listnode1 != null then
+                                       assert pformaldefnode2 isa nullable AFormaldef
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pformaldefnode2 != null then
                                                listnode3.add(pformaldefnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(122), node_list)
+                                       p.push(p.go_to(125), node_list)
        end
 init do end
 end
-private class ReduceAction702
+private class ReduceAction737
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var ppropdefnode1 = nodearraylist1
-                                       assert ppropdefnode1 isa PPropdef
+                                       assert ppropdefnode1 isa nullable APropdef
                                        if ppropdefnode1 != null then
                                                listnode2.add(ppropdefnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(123), node_list)
+                                       p.push(p.go_to(126), node_list)
        end
 init do end
 end
-private class ReduceAction703
+private class ReduceAction738
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var ppropdefnode2 = nodearraylist2
-                                       assert ppropdefnode2 isa PPropdef
-                                       if listnode1 != null then
+                                       assert ppropdefnode2 isa nullable APropdef
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if ppropdefnode2 != null then
                                                listnode3.add(ppropdefnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(123), node_list)
+                                       p.push(p.go_to(126), node_list)
        end
 init do end
 end
-private class ReduceAction704
+private class ReduceAction739
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pparamnode1 = nodearraylist1
-                                       assert pparamnode1 isa PParam
+                                       assert pparamnode1 isa nullable AParam
                                        if pparamnode1 != null then
                                                listnode2.add(pparamnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(124), node_list)
+                                       p.push(p.go_to(127), node_list)
        end
 init do end
 end
-private class ReduceAction705
+private class ReduceAction740
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pparamnode2 = nodearraylist2
-                                       assert pparamnode2 isa PParam
-                                       if listnode1 != null then
+                                       assert pparamnode2 isa nullable AParam
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pparamnode2 != null then
                                                listnode3.add(pparamnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(124), node_list)
+                                       p.push(p.go_to(127), node_list)
        end
 init do end
 end
-private class ReduceAction706
+private class ReduceAction741
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pclosuredeclnode1 = nodearraylist1
-                                       assert pclosuredeclnode1 isa PClosureDecl
+                                       assert pclosuredeclnode1 isa nullable AClosureDecl
                                        if pclosuredeclnode1 != null then
                                                listnode2.add(pclosuredeclnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(125), node_list)
+                                       p.push(p.go_to(128), node_list)
        end
 init do end
 end
-private class ReduceAction707
+private class ReduceAction742
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pclosuredeclnode2 = nodearraylist2
-                                       assert pclosuredeclnode2 isa PClosureDecl
-                                       if listnode1 != null then
+                                       assert pclosuredeclnode2 isa nullable AClosureDecl
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pclosuredeclnode2 != null then
                                                listnode3.add(pclosuredeclnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(125), node_list)
+                                       p.push(p.go_to(128), node_list)
        end
 init do end
 end
-private class ReduceAction708
+private class ReduceAction743
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var ptypenode1 = nodearraylist1
-                                       assert ptypenode1 isa PType
+                                       assert ptypenode1 isa nullable AType
                                        if ptypenode1 != null then
                                                listnode2.add(ptypenode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(126), node_list)
+                                       p.push(p.go_to(129), node_list)
        end
 init do end
 end
-private class ReduceAction709
+private class ReduceAction744
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var ptypenode2 = nodearraylist2
-                                       assert ptypenode2 isa PType
-                                       if listnode1 != null then
+                                       assert ptypenode2 isa nullable AType
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if ptypenode2 != null then
                                                listnode3.add(ptypenode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(126), node_list)
+                                       p.push(p.go_to(129), node_list)
        end
 init do end
 end
-private class ReduceAction710
+private class ReduceAction745
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        if pexprnode1 != null then
                                                listnode2.add(pexprnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(127), node_list)
+                                       p.push(p.go_to(130), node_list)
        end
 init do end
 end
-private class ReduceAction711
+private class ReduceAction746
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pexprnode2 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       if listnode1 != null then
+                                       assert pexprnode2 isa nullable AExpr
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pexprnode2 != null then
                                                listnode3.add(pexprnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(127), node_list)
+                                       p.push(p.go_to(130), node_list)
        end
 init do end
 end
-private class ReduceAction712
+private class ReduceAction747
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       if listnode1 != null then
+#                                      if listnode1 != null then
                                                if listnode2.is_empty then
                                                        listnode2 = listnode1
                                                else
                                                        listnode2.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        node_list = listnode2
-                                       p.push(p.go_to(128), node_list)
+                                       p.push(p.go_to(131), node_list)
        end
 init do end
 end
-private class ReduceAction713
+private class ReduceAction748
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var listnode2 = nodearraylist2 
+                                       var listnode2 = nodearraylist2
                                        assert listnode2 isa Array[Object]
-                                       if listnode1 != null then
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
-                                       if listnode2 != null then
+#                                      end
+#                                      if listnode2 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode2
                                                else
                                                        listnode3.append(listnode2)
                                                end
-                                       end
+#                                      end
                                        node_list = listnode3
-                                       p.push(p.go_to(128), node_list)
+                                       p.push(p.go_to(131), node_list)
        end
 init do end
 end
-private class ReduceAction714
+private class ReduceAction749
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pexprnode1 = nodearraylist1
-                                       assert pexprnode1 isa PExpr
+                                       assert pexprnode1 isa nullable AExpr
                                        if pexprnode1 != null then
                                                listnode2.add(pexprnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(129), node_list)
+                                       p.push(p.go_to(132), node_list)
        end
 init do end
 end
-private class ReduceAction715
+private class ReduceAction750
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var pexprnode2 = nodearraylist2
-                                       assert pexprnode2 isa PExpr
-                                       if listnode1 != null then
+                                       assert pexprnode2 isa nullable AExpr
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if pexprnode2 != null then
                                                listnode3.add(pexprnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(129), node_list)
+                                       p.push(p.go_to(132), node_list)
        end
 init do end
 end
-private class ReduceAction716
+private class ReduceAction751
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var tidnode1 = nodearraylist1
-                                       assert tidnode1 isa TId
+                                       assert tidnode1 isa nullable TId
                                        if tidnode1 != null then
                                                listnode2.add(tidnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(130), node_list)
+                                       p.push(p.go_to(133), node_list)
        end
 init do end
 end
-private class ReduceAction717
+private class ReduceAction752
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var tidnode2 = nodearraylist2
-                                       assert tidnode2 isa TId
-                                       if listnode1 != null then
+                                       assert tidnode2 isa nullable TId
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if tidnode2 != null then
                                                listnode3.add(tidnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(130), node_list)
+                                       p.push(p.go_to(133), node_list)
        end
 init do end
 end
-private class ReduceAction718
+private class ReduceAction753
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var tcommentnode1 = nodearraylist1
-                                       assert tcommentnode1 isa TComment
+                                       assert tcommentnode1 isa nullable TComment
                                        if tcommentnode1 != null then
                                                listnode2.add(tcommentnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(131), node_list)
+                                       p.push(p.go_to(134), node_list)
        end
 init do end
 end
-private class ReduceAction719
+private class ReduceAction754
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var tcommentnode2 = nodearraylist2
-                                       assert tcommentnode2 isa TComment
-                                       if listnode1 != null then
+                                       assert tcommentnode2 isa nullable TComment
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if tcommentnode2 != null then
                                                listnode3.add(tcommentnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(131), node_list)
+                                       p.push(p.go_to(134), node_list)
        end
 init do end
 end
-private class ReduceAction720
+private class ReduceAction755
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var teolnode1 = nodearraylist1
-                                       assert teolnode1 isa TEol
+                                       assert teolnode1 isa nullable TEol
                                        if teolnode1 != null then
                                                listnode2.add(teolnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(132), node_list)
+                                       p.push(p.go_to(135), node_list)
        end
 init do end
 end
-private class ReduceAction721
+private class ReduceAction756
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var teolnode2 = nodearraylist2
-                                       assert teolnode2 isa TEol
-                                       if listnode1 != null then
+                                       assert teolnode2 isa nullable TEol
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if teolnode2 != null then
                                                listnode3.add(teolnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(132), node_list)
+                                       p.push(p.go_to(135), node_list)
        end
 init do end
 end
-private class ReduceAction722
+private class ReduceAction757
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var ppropdefnode1 = nodearraylist1
-                                       assert ppropdefnode1 isa PPropdef
+                                       assert ppropdefnode1 isa nullable APropdef
                                        if ppropdefnode1 != null then
                                                listnode2.add(ppropdefnode1)
                                        end
                                        node_list = listnode2
-                                       p.push(p.go_to(133), node_list)
+                                       p.push(p.go_to(136), node_list)
        end
 init do end
 end
-private class ReduceAction723
+private class ReduceAction758
 special ReduceAction
-       redef meth action(p: Parser)
+       redef fun action(p: Parser)
        do
-                                       var node_list: Object = null
+                                       var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1 
+                                       var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
                                        var ppropdefnode2 = nodearraylist2
-                                       assert ppropdefnode2 isa PPropdef
-                                       if listnode1 != null then
+                                       assert ppropdefnode2 isa nullable APropdef
+#                                      if listnode1 != null then
                                                if listnode3.is_empty then
                                                        listnode3 = listnode1
                                                else
                                                        listnode3.append(listnode1)
                                                end
-                                       end
+#                                      end
                                        if ppropdefnode2 != null then
                                                listnode3.add(ppropdefnode2)
                                        end
                                        node_list = listnode3
-                                       p.push(p.go_to(133), node_list)
+                                       p.push(p.go_to(136), node_list)
        end
 init do end
 end