rta: store real types in live_cast_type
[nit.git] / src / parser / parser_prod.nit
index b51ae9e..05daac5 100644 (file)
@@ -1,70 +1,10 @@
 # Production AST nodes full definition.
 # This file was generated by SableCC (http://www.sablecc.org/).
-package parser_prod
+module parser_prod
 
 import lexer
 intrude import parser_nodes
-
-redef class ANode
-       # Parent of the node in the AST
-       readable writable var _parent: nullable ANode
-
-       # Remove a child from the AST
-       fun remove_child(child: ANode)
-       do
-               replace_child(child, null)
-       end
-
-       # Replace a child with an other node in the AST
-       fun replace_child(old_child: ANode, new_child: nullable ANode) is abstract
-
-       # Replace itself with an other node in the AST
-       fun replace_with(node: ANode)
-       do
-               if (_parent != null) then
-                       _parent.replace_child(self, node)
-               end
-       end
-
-       # Visit all nodes in order.
-       # Thus, call "v.visit(e)" for each node e
-       fun visit_all(v: Visitor) is abstract
-end
-
-redef class Token
-       redef fun visit_all(v: Visitor) do end
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode) do end
-end
-
-redef class Prod
-       redef fun replace_with(n: ANode)
-        do
-                super
-                assert n isa Prod
-                n.location = location
-        end
-end
-
-# Abstract standard visitor
-class Visitor
-       # What the visitor do when a node is visited
-        # Concrete visitors should redefine this method.
-        protected fun visit(e: nullable ANode) is abstract
-
-        # Ask the visitor to visit a given node.
-        # Usually automatically called by visit_all* methods.
-       # This methos should not be redefined
-        fun enter_visit(e: nullable ANode)
-       do
-               var old = _current_node
-               _current_node = e
-               visit(e)
-               _current_node = old
-       end
-
-       # The current visited node
-       readable var _current_node: nullable ANode = null
-end
+private import tables
 
 redef class AModule
     private init empty_init do end
@@ -72,6 +12,7 @@ redef class AModule
     init init_amodule (
             n_moduledecl: nullable AModuledecl,
             n_imports: Collection[Object], # Should be Collection[AImport]
+            n_extern_code_blocks: Collection[Object], # Should be Collection[AExternCodeBlock]
             n_classdefs: Collection[Object] # Should be Collection[AClassdef]
     )
     do
@@ -85,6 +26,11 @@ redef class AModule
                _n_imports.add(n)
                n.parent = self
        end
+       for n in n_extern_code_blocks do
+               assert n isa AExternCodeBlock
+               _n_extern_code_blocks.add(n)
+               n.parent = self
+       end
        for n in n_classdefs do
                assert n isa AClassdef
                _n_classdefs.add(n)
@@ -116,6 +62,18 @@ redef class AModule
                 return
             end
         end
+        for i in [0.._n_extern_code_blocks.length[ do
+            if _n_extern_code_blocks[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExternCodeBlock
+                    _n_extern_code_blocks[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_extern_code_blocks.remove_at(i)
+                end
+                return
+            end
+        end
         for i in [0.._n_classdefs.length[ do
             if _n_classdefs[i] == old_child then
                 if new_child != null then
@@ -130,6 +88,15 @@ redef class AModule
         end
     end
 
+               redef fun n_moduledecl=(node)
+               do
+                       _n_moduledecl = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_moduledecl != null then
@@ -138,6 +105,9 @@ redef class AModule
             for n in _n_imports do
                 v.enter_visit(n)
            end
+            for n in _n_extern_code_blocks do
+                v.enter_visit(n)
+           end
             for n in _n_classdefs do
                 v.enter_visit(n)
            end
@@ -149,7 +119,8 @@ redef class AModuledecl
     init init_amoduledecl (
             n_doc: nullable ADoc,
             n_kwmodule: nullable TKwmodule,
-            n_id: nullable TId
+            n_name: nullable AModuleName,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -159,8 +130,12 @@ redef class AModuledecl
        end
         _n_kwmodule = n_kwmodule.as(not null)
        n_kwmodule.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
+        _n_name = n_name.as(not null)
+       n_name.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -185,25 +160,64 @@ redef class AModuledecl
             end
             return
        end
-        if _n_id == old_child then
+        if _n_name == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TId
-                _n_id = new_child
+               assert new_child isa AModuleName
+                _n_name = new_child
            else
                abort
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwmodule=(node)
+               do
+                       _n_kwmodule = node
+                       node.parent = self
+               end
+               redef fun n_name=(node)
+               do
+                       _n_name = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
             v.enter_visit(_n_doc.as(not null))
         end
         v.enter_visit(_n_kwmodule)
-        v.enter_visit(_n_id)
+        v.enter_visit(_n_name)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AStdImport
@@ -212,7 +226,8 @@ redef class AStdImport
     init init_astdimport (
             n_visibility: nullable AVisibility,
             n_kwimport: nullable TKwimport,
-            n_id: nullable TId
+            n_name: nullable AModuleName,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -220,8 +235,12 @@ redef class AStdImport
        n_visibility.parent = self
         _n_kwimport = n_kwimport.as(not null)
        n_kwimport.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
+        _n_name = n_name.as(not null)
+       n_name.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -246,23 +265,60 @@ redef class AStdImport
             end
             return
        end
-        if _n_id == old_child then
+        if _n_name == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TId
-                _n_id = new_child
+               assert new_child isa AModuleName
+                _n_name = new_child
            else
                abort
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwimport=(node)
+               do
+                       _n_kwimport = node
+                       node.parent = self
+               end
+               redef fun n_name=(node)
+               do
+                       _n_name = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_visibility)
         v.enter_visit(_n_kwimport)
-        v.enter_visit(_n_id)
+        v.enter_visit(_n_name)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ANoImport
@@ -317,6 +373,23 @@ redef class ANoImport
        end
     end
 
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwimport=(node)
+               do
+                       _n_kwimport = node
+                       node.parent = self
+               end
+               redef fun n_kwend=(node)
+               do
+                       _n_kwend = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_visibility)
@@ -336,6 +409,8 @@ redef class APublicVisibility
     do
     end
 
+
+
     redef fun visit_all(v: Visitor)
     do
     end
@@ -366,6 +441,13 @@ redef class APrivateVisibility
        end
     end
 
+               redef fun n_kwprivate=(node)
+               do
+                       _n_kwprivate = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwprivate)
@@ -397,6 +479,13 @@ redef class AProtectedVisibility
        end
     end
 
+               redef fun n_kwprotected=(node)
+               do
+                       _n_kwprotected = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwprotected)
@@ -428,6 +517,13 @@ redef class AIntrudeVisibility
        end
     end
 
+               redef fun n_kwintrude=(node)
+               do
+                       _n_kwintrude = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwintrude)
@@ -443,8 +539,11 @@ redef class AStdClassdef
             n_classkind: nullable AClasskind,
             n_id: nullable TClassid,
             n_formaldefs: Collection[Object], # Should be Collection[AFormaldef]
+            n_annotations: nullable AAnnotations,
+            n_extern_code_block: nullable AExternCodeBlock,
             n_superclasses: Collection[Object], # Should be Collection[ASuperclass]
-            n_propdefs: Collection[Object] # Should be Collection[APropdef]
+            n_propdefs: Collection[Object], # Should be Collection[APropdef]
+            n_kwend: nullable TKwend
     )
     do
         empty_init
@@ -469,6 +568,14 @@ redef class AStdClassdef
                _n_formaldefs.add(n)
                n.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
+        _n_extern_code_block = n_extern_code_block
+       if n_extern_code_block != null then
+               n_extern_code_block.parent = self
+       end
        for n in n_superclasses do
                assert n isa ASuperclass
                _n_superclasses.add(n)
@@ -479,6 +586,8 @@ redef class AStdClassdef
                _n_propdefs.add(n)
                n.parent = self
        end
+        _n_kwend = n_kwend.as(not null)
+       n_kwend.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -545,6 +654,26 @@ redef class AStdClassdef
                 return
             end
         end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
+        if _n_extern_code_block == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExternCodeBlock
+                _n_extern_code_block = new_child
+           else
+               _n_extern_code_block = null
+            end
+            return
+       end
         for i in [0.._n_superclasses.length[ do
             if _n_superclasses[i] == old_child then
                 if new_child != null then
@@ -569,8 +698,70 @@ redef class AStdClassdef
                 return
             end
         end
+        if _n_kwend == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwend
+                _n_kwend = new_child
+           else
+               abort
+            end
+            return
+       end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_classkind=(node)
+               do
+                       _n_classkind = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_code_block=(node)
+               do
+                       _n_extern_code_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwend=(node)
+               do
+                       _n_kwend = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -587,12 +778,19 @@ redef class AStdClassdef
             for n in _n_formaldefs do
                 v.enter_visit(n)
            end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
+        if _n_extern_code_block != null then
+            v.enter_visit(_n_extern_code_block.as(not null))
+        end
             for n in _n_superclasses do
                 v.enter_visit(n)
            end
             for n in _n_propdefs do
                 v.enter_visit(n)
            end
+        v.enter_visit(_n_kwend)
     end
 end
 redef class ATopClassdef
@@ -626,6 +824,8 @@ redef class ATopClassdef
         end
     end
 
+
+
     redef fun visit_all(v: Visitor)
     do
             for n in _n_propdefs do
@@ -664,6 +864,8 @@ redef class AMainClassdef
         end
     end
 
+
+
     redef fun visit_all(v: Visitor)
     do
             for n in _n_propdefs do
@@ -697,6 +899,13 @@ redef class AConcreteClasskind
        end
     end
 
+               redef fun n_kwclass=(node)
+               do
+                       _n_kwclass = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwclass)
@@ -741,6 +950,18 @@ redef class AAbstractClasskind
        end
     end
 
+               redef fun n_kwabstract=(node)
+               do
+                       _n_kwabstract = node
+                       node.parent = self
+               end
+               redef fun n_kwclass=(node)
+               do
+                       _n_kwclass = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwabstract)
@@ -773,40 +994,117 @@ redef class AInterfaceClasskind
        end
     end
 
+               redef fun n_kwinterface=(node)
+               do
+                       _n_kwinterface = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwinterface)
     end
 end
-redef class AUniversalClasskind
+redef class AEnumClasskind
+    private init empty_init do end
+
+    init init_aenumclasskind (
+            n_kwenum: nullable TKwenum
+    )
+    do
+        empty_init
+        _n_kwenum = n_kwenum.as(not null)
+       n_kwenum.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwenum == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwenum
+                _n_kwenum = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_kwenum=(node)
+               do
+                       _n_kwenum = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwenum)
+    end
+end
+redef class AExternClasskind
     private init empty_init do end
 
-    init init_auniversalclasskind (
-            n_kwuniversal: nullable TKwuniversal
+    init init_aexternclasskind (
+            n_kwextern: nullable TKwextern,
+            n_kwclass: nullable TKwclass
     )
     do
         empty_init
-        _n_kwuniversal = n_kwuniversal.as(not null)
-       n_kwuniversal.parent = self
+        _n_kwextern = n_kwextern.as(not null)
+       n_kwextern.parent = self
+        _n_kwclass = n_kwclass
+       if n_kwclass != null then
+               n_kwclass.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_kwuniversal == old_child then
+        if _n_kwextern == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TKwuniversal
-                _n_kwuniversal = new_child
+               assert new_child isa TKwextern
+                _n_kwextern = new_child
            else
                abort
             end
             return
        end
+        if _n_kwclass == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwclass
+                _n_kwclass = new_child
+           else
+               _n_kwclass = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwextern=(node)
+               do
+                       _n_kwextern = node
+                       node.parent = self
+               end
+               redef fun n_kwclass=(node)
+               do
+                       _n_kwclass = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_kwuniversal)
+        v.enter_visit(_n_kwextern)
+        if _n_kwclass != null then
+            v.enter_visit(_n_kwclass.as(not null))
+        end
     end
 end
 redef class AFormaldef
@@ -814,7 +1112,8 @@ redef class AFormaldef
 
     init init_aformaldef (
             n_id: nullable TClassid,
-            n_type: nullable AType
+            n_type: nullable AType,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -824,6 +1123,10 @@ redef class AFormaldef
        if n_type != null then
                n_type.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -848,57 +1151,79 @@ redef class AFormaldef
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
         if _n_type != null then
             v.enter_visit(_n_type.as(not null))
         end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ASuperclass
     private init empty_init do end
 
     init init_asuperclass (
-            n_kwspecial: nullable TKwspecial,
             n_kwsuper: nullable TKwsuper,
-            n_type: nullable AType
+            n_type: nullable AType,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
-        _n_kwspecial = n_kwspecial
-       if n_kwspecial != null then
-               n_kwspecial.parent = self
-       end
-        _n_kwsuper = n_kwsuper
-       if n_kwsuper != null then
-               n_kwsuper.parent = self
-       end
+        _n_kwsuper = n_kwsuper.as(not null)
+       n_kwsuper.parent = self
         _n_type = n_type.as(not null)
        n_type.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_kwspecial == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TKwspecial
-                _n_kwspecial = new_child
-           else
-               _n_kwspecial = null
-            end
-            return
-       end
         if _n_kwsuper == old_child then
             if new_child != null then
                 new_child.parent = self
                assert new_child isa TKwsuper
                 _n_kwsuper = new_child
            else
-               _n_kwsuper = null
+               abort
             end
             return
        end
@@ -912,17 +1237,44 @@ redef class ASuperclass
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwsuper=(node)
+               do
+                       _n_kwsuper = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        if _n_kwspecial != null then
-            v.enter_visit(_n_kwspecial.as(not null))
-        end
-        if _n_kwsuper != null then
-            v.enter_visit(_n_kwsuper.as(not null))
-        end
+        v.enter_visit(_n_kwsuper)
         v.enter_visit(_n_type)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AAttrPropdef
@@ -936,7 +1288,9 @@ redef class AAttrPropdef
             n_visibility: nullable AVisibility,
             n_kwvar: nullable TKwvar,
             n_id: nullable TAttrid,
+            n_id2: nullable TId,
             n_type: nullable AType,
+            n_annotations: nullable AAnnotations,
             n_expr: nullable AExpr
     )
     do
@@ -961,12 +1315,22 @@ redef class AAttrPropdef
        n_visibility.parent = self
         _n_kwvar = n_kwvar.as(not null)
        n_kwvar.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
+        _n_id = n_id
+       if n_id != null then
+               n_id.parent = self
+       end
+        _n_id2 = n_id2
+       if n_id2 != null then
+               n_id2.parent = self
+       end
         _n_type = n_type
        if n_type != null then
                n_type.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
         _n_expr = n_expr
        if n_expr != null then
                n_expr.parent = self
@@ -1041,7 +1405,17 @@ redef class AAttrPropdef
                assert new_child isa TAttrid
                 _n_id = new_child
            else
-               abort
+               _n_id = null
+            end
+            return
+       end
+        if _n_id2 == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TId
+                _n_id2 = new_child
+           else
+               _n_id2 = null
             end
             return
        end
@@ -1055,6 +1429,16 @@ redef class AAttrPropdef
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -1067,8 +1451,83 @@ redef class AAttrPropdef
        end
     end
 
-    redef fun visit_all(v: Visitor)
-    do
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_readable=(node)
+               do
+                       _n_readable = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_writable=(node)
+               do
+                       _n_writable = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwvar=(node)
+               do
+                       _n_kwvar = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_id2=(node)
+               do
+                       _n_id2 = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
         if _n_doc != null then
             v.enter_visit(_n_doc.as(not null))
         end
@@ -1083,10 +1542,18 @@ redef class AAttrPropdef
         end
         v.enter_visit(_n_visibility)
         v.enter_visit(_n_kwvar)
-        v.enter_visit(_n_id)
+        if _n_id != null then
+            v.enter_visit(_n_id.as(not null))
+        end
+        if _n_id2 != null then
+            v.enter_visit(_n_id2.as(not null))
+        end
         if _n_type != null then
             v.enter_visit(_n_type.as(not null))
         end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
         if _n_expr != null then
             v.enter_visit(_n_expr.as(not null))
         end
@@ -1174,6 +1641,37 @@ redef class AMethPropdef
        end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1196,7 +1694,8 @@ redef class ADeferredMethPropdef
             n_visibility: nullable AVisibility,
             n_kwmeth: nullable TKwmeth,
             n_methid: nullable AMethid,
-            n_signature: nullable ASignature
+            n_signature: nullable ASignature,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -1216,6 +1715,10 @@ redef class ADeferredMethPropdef
        n_methid.parent = self
         _n_signature = n_signature.as(not null)
        n_signature.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1280,8 +1783,61 @@ redef class ADeferredMethPropdef
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwmeth=(node)
+               do
+                       _n_kwmeth = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1294,6 +1850,9 @@ redef class ADeferredMethPropdef
         v.enter_visit(_n_kwmeth)
         v.enter_visit(_n_methid)
         v.enter_visit(_n_signature)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AInternMethPropdef
@@ -1391,6 +1950,42 @@ redef class AInternMethPropdef
        end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwmeth=(node)
+               do
+                       _n_kwmeth = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1415,7 +2010,9 @@ redef class AExternMethPropdef
             n_kwmeth: nullable TKwmeth,
             n_methid: nullable AMethid,
             n_signature: nullable ASignature,
-            n_extern: nullable TString
+            n_extern: nullable TString,
+            n_extern_calls: nullable AExternCalls,
+            n_extern_code_block: nullable AExternCodeBlock
     )
     do
         empty_init
@@ -1439,6 +2036,14 @@ redef class AExternMethPropdef
        if n_extern != null then
                n_extern.parent = self
        end
+        _n_extern_calls = n_extern_calls
+       if n_extern_calls != null then
+               n_extern_calls.parent = self
+       end
+        _n_extern_code_block = n_extern_code_block
+       if n_extern_code_block != null then
+               n_extern_code_block.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1513,8 +2118,85 @@ redef class AExternMethPropdef
             end
             return
        end
+        if _n_extern_calls == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExternCalls
+                _n_extern_calls = new_child
+           else
+               _n_extern_calls = null
+            end
+            return
+       end
+        if _n_extern_code_block == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExternCodeBlock
+                _n_extern_code_block = new_child
+           else
+               _n_extern_code_block = null
+            end
+            return
+       end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwmeth=(node)
+               do
+                       _n_kwmeth = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+               redef fun n_extern=(node)
+               do
+                       _n_extern = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_calls=(node)
+               do
+                       _n_extern_calls = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_code_block=(node)
+               do
+                       _n_extern_code_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1530,6 +2212,12 @@ redef class AExternMethPropdef
         if _n_extern != null then
             v.enter_visit(_n_extern.as(not null))
         end
+        if _n_extern_calls != null then
+            v.enter_visit(_n_extern_calls.as(not null))
+        end
+        if _n_extern_code_block != null then
+            v.enter_visit(_n_extern_code_block.as(not null))
+        end
     end
 end
 redef class AConcreteMethPropdef
@@ -1542,6 +2230,7 @@ redef class AConcreteMethPropdef
             n_kwmeth: nullable TKwmeth,
             n_methid: nullable AMethid,
             n_signature: nullable ASignature,
+            n_annotations: nullable AAnnotations,
             n_block: nullable AExpr
     )
     do
@@ -1562,6 +2251,10 @@ redef class AConcreteMethPropdef
        n_methid.parent = self
         _n_signature = n_signature.as(not null)
        n_signature.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
         _n_block = n_block
        if n_block != null then
                n_block.parent = self
@@ -1630,6 +2323,16 @@ redef class AConcreteMethPropdef
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
         if _n_block == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -1642,6 +2345,56 @@ redef class AConcreteMethPropdef
        end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwmeth=(node)
+               do
+                       _n_kwmeth = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1654,6 +2407,9 @@ redef class AConcreteMethPropdef
         v.enter_visit(_n_kwmeth)
         v.enter_visit(_n_methid)
         v.enter_visit(_n_signature)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
         if _n_block != null then
             v.enter_visit(_n_block.as(not null))
         end
@@ -1669,6 +2425,7 @@ redef class AConcreteInitPropdef
             n_kwinit: nullable TKwinit,
             n_methid: nullable AMethid,
             n_signature: nullable ASignature,
+            n_annotations: nullable AAnnotations,
             n_block: nullable AExpr
     )
     do
@@ -1691,6 +2448,10 @@ redef class AConcreteInitPropdef
        end
         _n_signature = n_signature.as(not null)
        n_signature.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
         _n_block = n_block
        if n_block != null then
                n_block.parent = self
@@ -1759,6 +2520,16 @@ redef class AConcreteInitPropdef
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
         if _n_block == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -1771,6 +2542,58 @@ redef class AConcreteInitPropdef
        end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwinit=(node)
+               do
+                       _n_kwinit = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1785,74 +2608,27 @@ redef class AConcreteInitPropdef
             v.enter_visit(_n_methid.as(not null))
         end
         v.enter_visit(_n_signature)
-        if _n_block != null then
-            v.enter_visit(_n_block.as(not null))
-        end
-    end
-end
-redef class AMainMethPropdef
-    private init empty_init do end
-
-    init init_amainmethpropdef (
-            n_kwredef: nullable TKwredef,
-            n_block: nullable AExpr
-    )
-    do
-        empty_init
-        _n_kwredef = n_kwredef
-       if n_kwredef != null then
-               n_kwredef.parent = self
-       end
-        _n_block = n_block
-       if n_block != null then
-               n_block.parent = self
-       end
-    end
-
-    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-    do
-        if _n_kwredef == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TKwredef
-                _n_kwredef = new_child
-           else
-               _n_kwredef = null
-            end
-            return
-       end
-        if _n_block == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa AExpr
-                _n_block = new_child
-           else
-               _n_block = null
-            end
-            return
-       end
-    end
-
-    redef fun visit_all(v: Visitor)
-    do
-        if _n_kwredef != null then
-            v.enter_visit(_n_kwredef.as(not null))
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
         end
         if _n_block != null then
             v.enter_visit(_n_block.as(not null))
         end
     end
 end
-redef class ATypePropdef
+redef class AExternInitPropdef
     private init empty_init do end
 
-    init init_atypepropdef (
+    init init_aexterninitpropdef (
             n_doc: nullable ADoc,
             n_kwredef: nullable TKwredef,
             n_visibility: nullable AVisibility,
-            n_kwtype: nullable TKwtype,
-            n_id: nullable TClassid,
-            n_type: nullable AType
+            n_kwnew: nullable TKwnew,
+            n_methid: nullable AMethid,
+            n_signature: nullable ASignature,
+            n_extern: nullable TString,
+            n_extern_calls: nullable AExternCalls,
+            n_extern_code_block: nullable AExternCodeBlock
     )
     do
         empty_init
@@ -1866,12 +2642,26 @@ redef class ATypePropdef
        end
         _n_visibility = n_visibility.as(not null)
        n_visibility.parent = self
-        _n_kwtype = n_kwtype.as(not null)
-       n_kwtype.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
-        _n_type = n_type.as(not null)
-       n_type.parent = self
+        _n_kwnew = n_kwnew.as(not null)
+       n_kwnew.parent = self
+        _n_methid = n_methid
+       if n_methid != null then
+               n_methid.parent = self
+       end
+        _n_signature = n_signature.as(not null)
+       n_signature.parent = self
+        _n_extern = n_extern
+       if n_extern != null then
+               n_extern.parent = self
+       end
+        _n_extern_calls = n_extern_calls
+       if n_extern_calls != null then
+               n_extern_calls.parent = self
+       end
+        _n_extern_code_block = n_extern_code_block
+       if n_extern_code_block != null then
+               n_extern_code_block.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1906,38 +2696,127 @@ redef class ATypePropdef
             end
             return
        end
-        if _n_kwtype == old_child then
+        if _n_kwnew == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TKwtype
-                _n_kwtype = new_child
+               assert new_child isa TKwnew
+                _n_kwnew = new_child
            else
                abort
             end
             return
        end
-        if _n_id == old_child then
+        if _n_methid == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TClassid
-                _n_id = new_child
+               assert new_child isa AMethid
+                _n_methid = new_child
            else
-               abort
+               _n_methid = null
             end
             return
        end
-        if _n_type == old_child then
+        if _n_signature == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa AType
-                _n_type = new_child
+               assert new_child isa ASignature
+                _n_signature = new_child
            else
                abort
             end
             return
        end
+        if _n_extern == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TString
+                _n_extern = new_child
+           else
+               _n_extern = null
+            end
+            return
+       end
+        if _n_extern_calls == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExternCalls
+                _n_extern_calls = new_child
+           else
+               _n_extern_calls = null
+            end
+            return
+       end
+        if _n_extern_code_block == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExternCodeBlock
+                _n_extern_code_block = new_child
+           else
+               _n_extern_code_block = null
+            end
+            return
+       end
     end
 
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwnew=(node)
+               do
+                       _n_kwnew = node
+                       node.parent = self
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_signature=(node)
+               do
+                       _n_signature = node
+                       node.parent = self
+               end
+               redef fun n_extern=(node)
+               do
+                       _n_extern = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_calls=(node)
+               do
+                       _n_extern_calls = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_code_block=(node)
+               do
+                       _n_extern_code_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_doc != null then
@@ -1947,12 +2826,262 @@ redef class ATypePropdef
             v.enter_visit(_n_kwredef.as(not null))
         end
         v.enter_visit(_n_visibility)
-        v.enter_visit(_n_kwtype)
-        v.enter_visit(_n_id)
-        v.enter_visit(_n_type)
-    end
-end
-redef class AReadAble
+        v.enter_visit(_n_kwnew)
+        if _n_methid != null then
+            v.enter_visit(_n_methid.as(not null))
+        end
+        v.enter_visit(_n_signature)
+        if _n_extern != null then
+            v.enter_visit(_n_extern.as(not null))
+        end
+        if _n_extern_calls != null then
+            v.enter_visit(_n_extern_calls.as(not null))
+        end
+        if _n_extern_code_block != null then
+            v.enter_visit(_n_extern_code_block.as(not null))
+        end
+    end
+end
+redef class AMainMethPropdef
+    private init empty_init do end
+
+    init init_amainmethpropdef (
+            n_kwredef: nullable TKwredef,
+            n_block: nullable AExpr
+    )
+    do
+        empty_init
+        _n_kwredef = n_kwredef
+       if n_kwredef != null then
+               n_kwredef.parent = self
+       end
+        _n_block = n_block
+       if n_block != null then
+               n_block.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwredef == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwredef
+                _n_kwredef = new_child
+           else
+               _n_kwredef = null
+            end
+            return
+       end
+        if _n_block == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_block = new_child
+           else
+               _n_block = null
+            end
+            return
+       end
+    end
+
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        if _n_kwredef != null then
+            v.enter_visit(_n_kwredef.as(not null))
+        end
+        if _n_block != null then
+            v.enter_visit(_n_block.as(not null))
+        end
+    end
+end
+redef class ATypePropdef
+    private init empty_init do end
+
+    init init_atypepropdef (
+            n_doc: nullable ADoc,
+            n_kwredef: nullable TKwredef,
+            n_visibility: nullable AVisibility,
+            n_kwtype: nullable TKwtype,
+            n_id: nullable TClassid,
+            n_type: nullable AType,
+            n_annotations: nullable AAnnotations
+    )
+    do
+        empty_init
+        _n_doc = n_doc
+       if n_doc != null then
+               n_doc.parent = self
+       end
+        _n_kwredef = n_kwredef
+       if n_kwredef != null then
+               n_kwredef.parent = self
+       end
+        _n_visibility = n_visibility.as(not null)
+       n_visibility.parent = self
+        _n_kwtype = n_kwtype.as(not null)
+       n_kwtype.parent = self
+        _n_id = n_id.as(not null)
+       n_id.parent = self
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_doc == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa ADoc
+                _n_doc = new_child
+           else
+               _n_doc = null
+            end
+            return
+       end
+        if _n_kwredef == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwredef
+                _n_kwredef = new_child
+           else
+               _n_kwredef = null
+            end
+            return
+       end
+        if _n_visibility == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AVisibility
+                _n_visibility = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwtype == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwtype
+                _n_kwtype = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_id == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TClassid
+                _n_id = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
+    end
+
+               redef fun n_doc=(node)
+               do
+                       _n_doc = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       node.parent = self
+               end
+               redef fun n_kwtype=(node)
+               do
+                       _n_kwtype = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        if _n_doc != null then
+            v.enter_visit(_n_doc.as(not null))
+        end
+        if _n_kwredef != null then
+            v.enter_visit(_n_kwredef.as(not null))
+        end
+        v.enter_visit(_n_visibility)
+        v.enter_visit(_n_kwtype)
+        v.enter_visit(_n_id)
+        v.enter_visit(_n_type)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
+    end
+end
+redef class AReadAble
     private init empty_init do end
 
     init init_areadable (
@@ -1993,6 +3122,20 @@ redef class AReadAble
        end
     end
 
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwreadable=(node)
+               do
+                       _n_kwreadable = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_kwredef != null then
@@ -2006,6 +3149,7 @@ redef class AWriteAble
 
     init init_awriteable (
             n_kwredef: nullable TKwredef,
+            n_visibility: nullable AVisibility,
             n_kwwritable: nullable TKwwritable
     )
     do
@@ -2014,6 +3158,10 @@ redef class AWriteAble
        if n_kwredef != null then
                n_kwredef.parent = self
        end
+        _n_visibility = n_visibility
+       if n_visibility != null then
+               n_visibility.parent = self
+       end
         _n_kwwritable = n_kwwritable.as(not null)
        n_kwwritable.parent = self
     end
@@ -2030,6 +3178,16 @@ redef class AWriteAble
             end
             return
        end
+        if _n_visibility == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AVisibility
+                _n_visibility = new_child
+           else
+               _n_visibility = null
+            end
+            return
+       end
         if _n_kwwritable == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -2042,11 +3200,35 @@ redef class AWriteAble
        end
     end
 
+               redef fun n_kwredef=(node)
+               do
+                       _n_kwredef = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_visibility=(node)
+               do
+                       _n_visibility = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwwritable=(node)
+               do
+                       _n_kwwritable = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_kwredef != null then
             v.enter_visit(_n_kwredef.as(not null))
         end
+        if _n_visibility != null then
+            v.enter_visit(_n_visibility.as(not null))
+        end
         v.enter_visit(_n_kwwritable)
     end
 end
@@ -2076,6 +3258,13 @@ redef class AIdMethid
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
@@ -2107,6 +3296,13 @@ redef class APlusMethid
        end
     end
 
+               redef fun n_plus=(node)
+               do
+                       _n_plus = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_plus)
@@ -2138,6 +3334,13 @@ redef class AMinusMethid
        end
     end
 
+               redef fun n_minus=(node)
+               do
+                       _n_minus = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_minus)
@@ -2169,6 +3372,13 @@ redef class AStarMethid
        end
     end
 
+               redef fun n_star=(node)
+               do
+                       _n_star = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_star)
@@ -2200,6 +3410,13 @@ redef class ASlashMethid
        end
     end
 
+               redef fun n_slash=(node)
+               do
+                       _n_slash = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_slash)
@@ -2231,6 +3448,13 @@ redef class APercentMethid
        end
     end
 
+               redef fun n_percent=(node)
+               do
+                       _n_percent = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_percent)
@@ -2262,6 +3486,13 @@ redef class AEqMethid
        end
     end
 
+               redef fun n_eq=(node)
+               do
+                       _n_eq = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_eq)
@@ -2293,6 +3524,13 @@ redef class ANeMethid
        end
     end
 
+               redef fun n_ne=(node)
+               do
+                       _n_ne = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_ne)
@@ -2324,6 +3562,13 @@ redef class ALeMethid
        end
     end
 
+               redef fun n_le=(node)
+               do
+                       _n_le = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_le)
@@ -2355,6 +3600,13 @@ redef class AGeMethid
        end
     end
 
+               redef fun n_ge=(node)
+               do
+                       _n_ge = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_ge)
@@ -2386,6 +3638,13 @@ redef class ALtMethid
        end
     end
 
+               redef fun n_lt=(node)
+               do
+                       _n_lt = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_lt)
@@ -2417,16 +3676,99 @@ redef class AGtMethid
        end
     end
 
+               redef fun n_gt=(node)
+               do
+                       _n_gt = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_gt)
     end
 end
-redef class ABraMethid
+redef class ALlMethid
     private init empty_init do end
 
-    init init_abramethid (
-            n_obra: nullable TObra,
+    init init_allmethid (
+            n_ll: nullable TLl
+    )
+    do
+        empty_init
+        _n_ll = n_ll.as(not null)
+       n_ll.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_ll == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TLl
+                _n_ll = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_ll=(node)
+               do
+                       _n_ll = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_ll)
+    end
+end
+redef class AGgMethid
+    private init empty_init do end
+
+    init init_aggmethid (
+            n_gg: nullable TGg
+    )
+    do
+        empty_init
+        _n_gg = n_gg.as(not null)
+       n_gg.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_gg == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TGg
+                _n_gg = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_gg=(node)
+               do
+                       _n_gg = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_gg)
+    end
+end
+redef class ABraMethid
+    private init empty_init do end
+
+    init init_abramethid (
+            n_obra: nullable TObra,
             n_cbra: nullable TCbra
     )
     do
@@ -2461,6 +3803,18 @@ redef class ABraMethid
        end
     end
 
+               redef fun n_obra=(node)
+               do
+                       _n_obra = node
+                       node.parent = self
+               end
+               redef fun n_cbra=(node)
+               do
+                       _n_cbra = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_obra)
@@ -2493,6 +3847,13 @@ redef class AStarshipMethid
        end
     end
 
+               redef fun n_starship=(node)
+               do
+                       _n_starship = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_starship)
@@ -2537,6 +3898,18 @@ redef class AAssignMethid
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
@@ -2595,6 +3968,23 @@ redef class ABraassignMethid
        end
     end
 
+               redef fun n_obra=(node)
+               do
+                       _n_obra = node
+                       node.parent = self
+               end
+               redef fun n_cbra=(node)
+               do
+                       _n_cbra = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_obra)
@@ -2606,30 +3996,44 @@ redef class ASignature
     private init empty_init do end
 
     init init_asignature (
+            n_opar: nullable TOpar,
             n_params: Collection[Object], # Should be Collection[AParam]
-            n_type: nullable AType,
-            n_closure_decls: Collection[Object] # Should be Collection[AClosureDecl]
+            n_cpar: nullable TCpar,
+            n_type: nullable AType
     )
     do
         empty_init
+        _n_opar = n_opar
+       if n_opar != null then
+               n_opar.parent = self
+       end
        for n in n_params do
                assert n isa AParam
                _n_params.add(n)
                n.parent = self
        end
+        _n_cpar = n_cpar
+       if n_cpar != null then
+               n_cpar.parent = self
+       end
         _n_type = n_type
        if n_type != null then
                n_type.parent = self
        end
-       for n in n_closure_decls do
-               assert n isa AClosureDecl
-               _n_closure_decls.add(n)
-               n.parent = self
-       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               _n_opar = null
+            end
+            return
+       end
         for i in [0.._n_params.length[ do
             if _n_params[i] == old_child then
                 if new_child != null then
@@ -2642,6 +4046,16 @@ redef class ASignature
                 return
             end
         end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               _n_cpar = null
+            end
+            return
+       end
         if _n_type == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -2652,31 +4066,45 @@ redef class ASignature
             end
             return
        end
-        for i in [0.._n_closure_decls.length[ do
-            if _n_closure_decls[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AClosureDecl
-                    _n_closure_decls[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_closure_decls.remove_at(i)
-                end
-                return
-            end
-        end
     end
 
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
+        if _n_opar != null then
+            v.enter_visit(_n_opar.as(not null))
+        end
             for n in _n_params do
                 v.enter_visit(n)
            end
+        if _n_cpar != null then
+            v.enter_visit(_n_cpar.as(not null))
+        end
         if _n_type != null then
             v.enter_visit(_n_type.as(not null))
         end
-            for n in _n_closure_decls do
-                v.enter_visit(n)
-           end
     end
 end
 redef class AParam
@@ -2685,7 +4113,8 @@ redef class AParam
     init init_aparam (
             n_id: nullable TId,
             n_type: nullable AType,
-            n_dotdotdot: nullable TDotdotdot
+            n_dotdotdot: nullable TDotdotdot,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -2699,6 +4128,10 @@ redef class AParam
        if n_dotdotdot != null then
                n_dotdotdot.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -2733,111 +4166,57 @@ redef class AParam
             end
             return
        end
-    end
-
-    redef fun visit_all(v: Visitor)
-    do
-        v.enter_visit(_n_id)
-        if _n_type != null then
-            v.enter_visit(_n_type.as(not null))
-        end
-        if _n_dotdotdot != null then
-            v.enter_visit(_n_dotdotdot.as(not null))
-        end
-    end
-end
-redef class AClosureDecl
-    private init empty_init do end
-
-    init init_aclosuredecl (
-            n_kwbreak: nullable TKwbreak,
-            n_bang: nullable TBang,
-            n_id: nullable TId,
-            n_signature: nullable ASignature,
-            n_expr: nullable AExpr
-    )
-    do
-        empty_init
-        _n_kwbreak = n_kwbreak
-       if n_kwbreak != null then
-               n_kwbreak.parent = self
-       end
-        _n_bang = n_bang.as(not null)
-       n_bang.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
-        _n_signature = n_signature.as(not null)
-       n_signature.parent = self
-        _n_expr = n_expr
-       if n_expr != null then
-               n_expr.parent = self
-       end
-    end
-
-    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-    do
-        if _n_kwbreak == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TKwbreak
-                _n_kwbreak = new_child
-           else
-               _n_kwbreak = null
-            end
-            return
-       end
-        if _n_bang == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TBang
-                _n_bang = new_child
-           else
-               abort
-            end
-            return
-       end
-        if _n_id == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TId
-                _n_id = new_child
-           else
-               abort
-            end
-            return
-       end
-        if _n_signature == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa ASignature
-                _n_signature = new_child
-           else
-               abort
-            end
-            return
-       end
-        if _n_expr == old_child then
+        if _n_annotations == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa AExpr
-                _n_expr = new_child
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
            else
-               _n_expr = null
+               _n_annotations = null
             end
             return
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_dotdotdot=(node)
+               do
+                       _n_dotdotdot = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        if _n_kwbreak != null then
-            v.enter_visit(_n_kwbreak.as(not null))
-        end
-        v.enter_visit(_n_bang)
         v.enter_visit(_n_id)
-        v.enter_visit(_n_signature)
-        if _n_expr != null then
-            v.enter_visit(_n_expr.as(not null))
+        if _n_type != null then
+            v.enter_visit(_n_type.as(not null))
+        end
+        if _n_dotdotdot != null then
+            v.enter_visit(_n_dotdotdot.as(not null))
+        end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
         end
     end
 end
@@ -2847,7 +4226,8 @@ redef class AType
     init init_atype (
             n_kwnullable: nullable TKwnullable,
             n_id: nullable TClassid,
-            n_types: Collection[Object] # Should be Collection[AType]
+            n_types: Collection[Object], # Should be Collection[AType]
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -2862,6 +4242,10 @@ redef class AType
                _n_types.add(n)
                n.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -2898,8 +4282,39 @@ redef class AType
                 return
             end
         end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwnullable=(node)
+               do
+                       _n_kwnullable = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_kwnullable != null then
@@ -2909,6 +4324,9 @@ redef class AType
             for n in _n_types do
                 v.enter_visit(n)
            end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ALabel
@@ -2950,6 +4368,18 @@ redef class ALabel
        end
     end
 
+               redef fun n_kwlabel=(node)
+               do
+                       _n_kwlabel = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwlabel)
@@ -2960,7 +4390,8 @@ redef class ABlockExpr
     private init empty_init do end
 
     init init_ablockexpr (
-            n_expr: Collection[Object] # Should be Collection[AExpr]
+            n_expr: Collection[Object], # Should be Collection[AExpr]
+            n_kwend: nullable TKwend
     )
     do
         empty_init
@@ -2969,6 +4400,10 @@ redef class ABlockExpr
                _n_expr.add(n)
                n.parent = self
        end
+        _n_kwend = n_kwend
+       if n_kwend != null then
+               n_kwend.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -2985,13 +4420,35 @@ redef class ABlockExpr
                 return
             end
         end
+        if _n_kwend == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwend
+                _n_kwend = new_child
+           else
+               _n_kwend = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwend=(node)
+               do
+                       _n_kwend = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
             for n in _n_expr do
                 v.enter_visit(n)
            end
+        if _n_kwend != null then
+            v.enter_visit(_n_kwend.as(not null))
+        end
     end
 end
 redef class AVardeclExpr
@@ -3002,7 +4459,8 @@ redef class AVardeclExpr
             n_id: nullable TId,
             n_type: nullable AType,
             n_assign: nullable TAssign,
-            n_expr: nullable AExpr
+            n_expr: nullable AExpr,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -3022,6 +4480,10 @@ redef class AVardeclExpr
        if n_expr != null then
                n_expr.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -3076,8 +4538,58 @@ redef class AVardeclExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwvar=(node)
+               do
+                       _n_kwvar = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwvar)
@@ -3091,6 +4603,9 @@ redef class AVardeclExpr
         if _n_expr != null then
             v.enter_visit(_n_expr.as(not null))
         end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AReturnExpr
@@ -3136,6 +4651,22 @@ redef class AReturnExpr
        end
     end
 
+               redef fun n_kwreturn=(node)
+               do
+                       _n_kwreturn = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_kwreturn != null then
@@ -3202,6 +4733,27 @@ redef class ABreakExpr
        end
     end
 
+               redef fun n_kwbreak=(node)
+               do
+                       _n_kwbreak = node
+                       node.parent = self
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwbreak)
@@ -3239,8 +4791,15 @@ redef class AAbortExpr
        end
     end
 
-    redef fun visit_all(v: Visitor)
-    do
+               redef fun n_kwabort=(node)
+               do
+                       _n_kwabort = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
         v.enter_visit(_n_kwabort)
     end
 end
@@ -3302,6 +4861,29 @@ redef class AContinueExpr
        end
     end
 
+               redef fun n_kwcontinue=(node)
+               do
+                       _n_kwcontinue = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_kwcontinue != null then
@@ -3371,6 +4953,27 @@ redef class ADoExpr
        end
     end
 
+               redef fun n_kwdo=(node)
+               do
+                       _n_kwdo = node
+                       node.parent = self
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwdo)
@@ -3451,6 +5054,32 @@ redef class AIfExpr
        end
     end
 
+               redef fun n_kwif=(node)
+               do
+                       _n_kwif = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_then=(node)
+               do
+                       _n_then = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_else=(node)
+               do
+                       _n_else = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwif)
@@ -3554,6 +5183,38 @@ redef class AIfexprExpr
        end
     end
 
+               redef fun n_kwif=(node)
+               do
+                       _n_kwif = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwthen=(node)
+               do
+                       _n_kwthen = node
+                       node.parent = self
+               end
+               redef fun n_then=(node)
+               do
+                       _n_then = node
+                       node.parent = self
+               end
+               redef fun n_kwelse=(node)
+               do
+                       _n_kwelse = node
+                       node.parent = self
+               end
+               redef fun n_else=(node)
+               do
+                       _n_else = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwif)
@@ -3646,6 +5307,37 @@ redef class AWhileExpr
        end
     end
 
+               redef fun n_kwwhile=(node)
+               do
+                       _n_kwwhile = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwdo=(node)
+               do
+                       _n_kwdo = node
+                       node.parent = self
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwwhile)
@@ -3715,6 +5407,27 @@ redef class ALoopExpr
        end
     end
 
+               redef fun n_kwloop=(node)
+               do
+                       _n_kwloop = node
+                       node.parent = self
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwloop)
@@ -3731,7 +5444,7 @@ redef class AForExpr
 
     init init_aforexpr (
             n_kwfor: nullable TKwfor,
-            n_id: nullable TId,
+            n_ids: Collection[Object], # Should be Collection[TId]
             n_expr: nullable AExpr,
             n_kwdo: nullable TKwdo,
             n_block: nullable AExpr,
@@ -3741,8 +5454,11 @@ redef class AForExpr
         empty_init
         _n_kwfor = n_kwfor.as(not null)
        n_kwfor.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
+       for n in n_ids do
+               assert n isa TId
+               _n_ids.add(n)
+               n.parent = self
+       end
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
         _n_kwdo = n_kwdo.as(not null)
@@ -3769,16 +5485,18 @@ redef class AForExpr
             end
             return
        end
-        if _n_id == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TId
-                _n_id = new_child
-           else
-               abort
+        for i in [0.._n_ids.length[ do
+            if _n_ids[i] == old_child then
+                if new_child != null then
+                   assert new_child isa TId
+                    _n_ids[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_ids.remove_at(i)
+                end
+                return
             end
-            return
-       end
+        end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -3821,10 +5539,43 @@ redef class AForExpr
        end
     end
 
+               redef fun n_kwfor=(node)
+               do
+                       _n_kwfor = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwdo=(node)
+               do
+                       _n_kwdo = node
+                       node.parent = self
+               end
+               redef fun n_block=(node)
+               do
+                       _n_block = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_label=(node)
+               do
+                       _n_label = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwfor)
-        v.enter_visit(_n_id)
+            for n in _n_ids do
+                v.enter_visit(n)
+           end
         v.enter_visit(_n_expr)
         v.enter_visit(_n_kwdo)
         if _n_block != null then
@@ -3904,6 +5655,32 @@ redef class AAssertExpr
        end
     end
 
+               redef fun n_kwassert=(node)
+               do
+                       _n_kwassert = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_else=(node)
+               do
+                       _n_else = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwassert)
@@ -3955,6 +5732,18 @@ redef class AOnceExpr
        end
     end
 
+               redef fun n_kwonce=(node)
+               do
+                       _n_kwonce = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwonce)
@@ -3987,6 +5776,13 @@ redef class ASendExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4031,6 +5827,18 @@ redef class ABinopExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4076,6 +5884,18 @@ redef class AOrExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4121,6 +5941,18 @@ redef class AAndExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4166,6 +5998,75 @@ redef class AOrElseExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_expr)
+        v.enter_visit(_n_expr2)
+    end
+end
+redef class AImpliesExpr
+    private init empty_init do end
+
+    init init_aimpliesexpr (
+            n_expr: nullable AExpr,
+            n_expr2: nullable AExpr
+    )
+    do
+        empty_init
+        _n_expr = n_expr.as(not null)
+       n_expr.parent = self
+        _n_expr2 = n_expr2.as(not null)
+       n_expr2.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_expr == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_expr2 == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr2 = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4211,6 +6112,18 @@ redef class ANotExpr
        end
     end
 
+               redef fun n_kwnot=(node)
+               do
+                       _n_kwnot = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwnot)
@@ -4256,16 +6169,28 @@ redef class AEqExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class AEeExpr
+redef class ANeExpr
     private init empty_init do end
 
-    init init_aeeexpr (
+    init init_aneexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4301,16 +6226,28 @@ redef class AEeExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class ANeExpr
+redef class ALtExpr
     private init empty_init do end
 
-    init init_aneexpr (
+    init init_altexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4346,16 +6283,28 @@ redef class ANeExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class ALtExpr
+redef class ALeExpr
     private init empty_init do end
 
-    init init_altexpr (
+    init init_aleexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4391,16 +6340,28 @@ redef class ALtExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class ALeExpr
+redef class ALlExpr
     private init empty_init do end
 
-    init init_aleexpr (
+    init init_allexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4436,6 +6397,18 @@ redef class ALeExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4481,6 +6454,18 @@ redef class AGtExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4526,25 +6511,37 @@ redef class AGeExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class AIsaExpr
+redef class AGgExpr
     private init empty_init do end
 
-    init init_aisaexpr (
+    init init_aggexpr (
             n_expr: nullable AExpr,
-            n_type: nullable AType
+            n_expr2: nullable AExpr
     )
     do
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-        _n_type = n_type.as(not null)
-       n_type.parent = self
+        _n_expr2 = n_expr2.as(not null)
+       n_expr2.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -4559,11 +6556,11 @@ redef class AIsaExpr
             end
             return
        end
-        if _n_type == old_child then
+        if _n_expr2 == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa AType
-                _n_type = new_child
+               assert new_child isa AExpr
+                _n_expr2 = new_child
            else
                abort
             end
@@ -4571,25 +6568,37 @@ redef class AIsaExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-        v.enter_visit(_n_type)
+        v.enter_visit(_n_expr2)
     end
 end
-redef class APlusExpr
+redef class AIsaExpr
     private init empty_init do end
 
-    init init_aplusexpr (
+    init init_aisaexpr (
             n_expr: nullable AExpr,
-            n_expr2: nullable AExpr
+            n_type: nullable AType
     )
     do
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-        _n_expr2 = n_expr2.as(not null)
-       n_expr2.parent = self
+        _n_type = n_type.as(not null)
+       n_type.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -4604,11 +6613,11 @@ redef class APlusExpr
             end
             return
        end
-        if _n_expr2 == old_child then
+        if _n_type == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa AExpr
-                _n_expr2 = new_child
+               assert new_child isa AType
+                _n_type = new_child
            else
                abort
             end
@@ -4616,16 +6625,28 @@ redef class APlusExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-        v.enter_visit(_n_expr2)
+        v.enter_visit(_n_type)
     end
 end
-redef class AMinusExpr
+redef class APlusExpr
     private init empty_init do end
 
-    init init_aminusexpr (
+    init init_aplusexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4661,16 +6682,28 @@ redef class AMinusExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
     end
 end
-redef class AStarshipExpr
+redef class AMinusExpr
     private init empty_init do end
 
-    init init_astarshipexpr (
+    init init_aminusexpr (
             n_expr: nullable AExpr,
             n_expr2: nullable AExpr
     )
@@ -4706,7 +6739,76 @@ redef class AStarshipExpr
        end
     end
 
-    redef fun visit_all(v: Visitor)
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_expr)
+        v.enter_visit(_n_expr2)
+    end
+end
+redef class AStarshipExpr
+    private init empty_init do end
+
+    init init_astarshipexpr (
+            n_expr: nullable AExpr,
+            n_expr2: nullable AExpr
+    )
+    do
+        empty_init
+        _n_expr = n_expr.as(not null)
+       n_expr.parent = self
+        _n_expr2 = n_expr2.as(not null)
+       n_expr2.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_expr == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_expr2 == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr2 = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
@@ -4751,6 +6853,18 @@ redef class AStarExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4796,6 +6910,18 @@ redef class ASlashExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4841,6 +6967,18 @@ redef class APercentExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -4886,6 +7024,18 @@ redef class AUminusExpr
        end
     end
 
+               redef fun n_minus=(node)
+               do
+                       _n_minus = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_minus)
@@ -4899,7 +7049,7 @@ redef class ANewExpr
             n_kwnew: nullable TKwnew,
             n_type: nullable AType,
             n_id: nullable TId,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -4911,11 +7061,8 @@ redef class ANewExpr
        if n_id != null then
                n_id.parent = self
        end
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -4950,20 +7097,42 @@ redef class ANewExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_kwnew=(node)
+               do
+                       _n_kwnew = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwnew)
@@ -4971,9 +7140,7 @@ redef class ANewExpr
         if _n_id != null then
             v.enter_visit(_n_id.as(not null))
         end
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class AAttrExpr
@@ -5015,6 +7182,18 @@ redef class AAttrExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -5086,6 +7265,28 @@ redef class AAttrAssignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -5159,6 +7360,28 @@ redef class AAttrReassignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_assign_op=(node)
+               do
+                       _n_assign_op = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
@@ -5173,8 +7396,7 @@ redef class ACallExpr
     init init_acallexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
-            n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5182,16 +7404,8 @@ redef class ACallExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
-       for n in n_closure_defs do
-               assert n isa AClosureDef
-               _n_closure_defs.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5216,42 +7430,40 @@ redef class ACallExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
-            end
-        end
-        for i in [0.._n_closure_defs.length[ do
-            if _n_closure_defs[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AClosureDef
-                    _n_closure_defs[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_closure_defs.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
-            for n in _n_closure_defs do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class ACallAssignExpr
@@ -5260,7 +7472,7 @@ redef class ACallAssignExpr
     init init_acallassignexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign: nullable TAssign,
             n_value: nullable AExpr
     )
@@ -5270,11 +7482,8 @@ redef class ACallAssignExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign = n_assign.as(not null)
        n_assign.parent = self
         _n_value = n_value.as(not null)
@@ -5303,18 +7512,16 @@ redef class ACallAssignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5337,13 +7544,38 @@ redef class ACallAssignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign)
         v.enter_visit(_n_value)
     end
@@ -5354,7 +7586,7 @@ redef class ACallReassignExpr
     init init_acallreassignexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign_op: nullable AAssignOp,
             n_value: nullable AExpr
     )
@@ -5364,11 +7596,8 @@ redef class ACallReassignExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign_op = n_assign_op.as(not null)
        n_assign_op.parent = self
         _n_value = n_value.as(not null)
@@ -5397,18 +7626,16 @@ redef class ACallReassignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign_op == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5431,13 +7658,38 @@ redef class ACallReassignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+               redef fun n_assign_op=(node)
+               do
+                       _n_assign_op = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign_op)
         v.enter_visit(_n_value)
     end
@@ -5448,7 +7700,7 @@ redef class ASuperExpr
     init init_asuperexpr (
             n_qualified: nullable AQualified,
             n_kwsuper: nullable TKwsuper,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5458,11 +7710,8 @@ redef class ASuperExpr
        end
         _n_kwsuper = n_kwsuper.as(not null)
        n_kwsuper.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5487,29 +7736,44 @@ redef class ASuperExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_qualified=(node)
+               do
+                       _n_qualified = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwsuper=(node)
+               do
+                       _n_kwsuper = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         if _n_qualified != null then
             v.enter_visit(_n_qualified.as(not null))
         end
         v.enter_visit(_n_kwsuper)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class AInitExpr
@@ -5518,7 +7782,7 @@ redef class AInitExpr
     init init_ainitexpr (
             n_expr: nullable AExpr,
             n_kwinit: nullable TKwinit,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5526,11 +7790,8 @@ redef class AInitExpr
        n_expr.parent = self
         _n_kwinit = n_kwinit.as(not null)
        n_kwinit.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5555,27 +7816,40 @@ redef class AInitExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwinit=(node)
+               do
+                       _n_kwinit = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_kwinit)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class ABraExpr
@@ -5583,23 +7857,14 @@ redef class ABraExpr
 
     init init_abraexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
-            n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
+            n_args: nullable AExprs
     )
     do
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
-       for n in n_closure_defs do
-               assert n isa AClosureDef
-               _n_closure_defs.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5614,41 +7879,34 @@ redef class ABraExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
-            end
-        end
-        for i in [0.._n_closure_defs.length[ do
-            if _n_closure_defs[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AClosureDef
-                    _n_closure_defs[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_closure_defs.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
-            for n in _n_closure_defs do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class ABraAssignExpr
@@ -5656,7 +7914,7 @@ redef class ABraAssignExpr
 
     init init_abraassignexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign: nullable TAssign,
             n_value: nullable AExpr
     )
@@ -5664,11 +7922,8 @@ redef class ABraAssignExpr
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign = n_assign.as(not null)
        n_assign.parent = self
         _n_value = n_value.as(not null)
@@ -5687,18 +7942,16 @@ redef class ABraAssignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5721,12 +7974,32 @@ redef class ABraAssignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign)
         v.enter_visit(_n_value)
     end
@@ -5736,7 +8009,7 @@ redef class ABraReassignExpr
 
     init init_abrareassignexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign_op: nullable AAssignOp,
             n_value: nullable AExpr
     )
@@ -5744,11 +8017,8 @@ redef class ABraReassignExpr
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign_op = n_assign_op.as(not null)
        n_assign_op.parent = self
         _n_value = n_value.as(not null)
@@ -5767,18 +8037,16 @@ redef class ABraReassignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign_op == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5801,89 +8069,36 @@ redef class ABraReassignExpr
        end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_args=(node)
+               do
+                       _n_args = node
+                       node.parent = self
+               end
+               redef fun n_assign_op=(node)
+               do
+                       _n_assign_op = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign_op)
         v.enter_visit(_n_value)
     end
 end
-redef class AClosureCallExpr
-    private init empty_init do end
-
-    init init_aclosurecallexpr (
-            n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
-            n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
-    )
-    do
-        empty_init
-        _n_id = n_id.as(not null)
-       n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
-       for n in n_closure_defs do
-               assert n isa AClosureDef
-               _n_closure_defs.add(n)
-               n.parent = self
-       end
-    end
-
-    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-    do
-        if _n_id == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TId
-                _n_id = new_child
-           else
-               abort
-            end
-            return
-       end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
-            end
-        end
-        for i in [0.._n_closure_defs.length[ do
-            if _n_closure_defs[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AClosureDef
-                    _n_closure_defs[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_closure_defs.remove_at(i)
-                end
-                return
-            end
-        end
-    end
-
-    redef fun visit_all(v: Visitor)
-    do
-        v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
-            for n in _n_closure_defs do
-                v.enter_visit(n)
-           end
-    end
-end
 redef class AVarExpr
     private init empty_init do end
 
@@ -5910,6 +8125,13 @@ redef class AVarExpr
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
@@ -5967,6 +8189,23 @@ redef class AVarAssignExpr
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_assign=(node)
+               do
+                       _n_assign = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
@@ -6026,6 +8265,23 @@ redef class AVarReassignExpr
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+               redef fun n_assign_op=(node)
+               do
+                       _n_assign_op = node
+                       node.parent = self
+               end
+               redef fun n_value=(node)
+               do
+                       _n_value = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
@@ -6038,7 +8294,8 @@ redef class ARangeExpr
 
     init init_arangeexpr (
             n_expr: nullable AExpr,
-            n_expr2: nullable AExpr
+            n_expr2: nullable AExpr,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -6046,6 +8303,10 @@ redef class ARangeExpr
        n_expr.parent = self
         _n_expr2 = n_expr2.as(not null)
        n_expr2.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6070,31 +8331,84 @@ redef class ARangeExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ACrangeExpr
     private init empty_init do end
 
     init init_acrangeexpr (
+            n_obra: nullable TObra,
             n_expr: nullable AExpr,
-            n_expr2: nullable AExpr
+            n_expr2: nullable AExpr,
+            n_cbra: nullable TCbra,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
+        _n_obra = n_obra.as(not null)
+       n_obra.parent = self
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
         _n_expr2 = n_expr2.as(not null)
        n_expr2.parent = self
+        _n_cbra = n_cbra.as(not null)
+       n_cbra.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
+        if _n_obra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TObra
+                _n_obra = new_child
+           else
+               abort
+            end
+            return
+       end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6115,31 +8429,106 @@ redef class ACrangeExpr
             end
             return
        end
+        if _n_cbra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCbra
+                _n_cbra = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_obra=(node)
+               do
+                       _n_obra = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+               redef fun n_cbra=(node)
+               do
+                       _n_cbra = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
+        v.enter_visit(_n_obra)
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
+        v.enter_visit(_n_cbra)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AOrangeExpr
     private init empty_init do end
 
     init init_aorangeexpr (
+            n_obra: nullable TObra,
             n_expr: nullable AExpr,
-            n_expr2: nullable AExpr
+            n_expr2: nullable AExpr,
+            n_cbra: nullable TObra,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
+        _n_obra = n_obra.as(not null)
+       n_obra.parent = self
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
         _n_expr2 = n_expr2.as(not null)
        n_expr2.parent = self
+        _n_cbra = n_cbra.as(not null)
+       n_cbra.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
+        if _n_obra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TObra
+                _n_obra = new_child
+           else
+               abort
+            end
+            return
+       end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6160,62 +8549,146 @@ redef class AOrangeExpr
             end
             return
        end
+        if _n_cbra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TObra
+                _n_cbra = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_obra=(node)
+               do
+                       _n_obra = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_expr2=(node)
+               do
+                       _n_expr2 = node
+                       node.parent = self
+               end
+               redef fun n_cbra=(node)
+               do
+                       _n_cbra = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
+        v.enter_visit(_n_obra)
         v.enter_visit(_n_expr)
         v.enter_visit(_n_expr2)
+        v.enter_visit(_n_cbra)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AArrayExpr
     private init empty_init do end
 
     init init_aarrayexpr (
-            n_exprs: Collection[Object] # Should be Collection[AExpr]
+            n_exprs: nullable AExprs,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
-       for n in n_exprs do
-               assert n isa AExpr
-               _n_exprs.add(n)
-               n.parent = self
+        _n_exprs = n_exprs.as(not null)
+       n_exprs.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
        end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        for i in [0.._n_exprs.length[ do
-            if _n_exprs[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_exprs[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_exprs.remove_at(i)
-                end
-                return
+        if _n_exprs == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_exprs = new_child
+           else
+               abort
             end
-        end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_exprs=(node)
+               do
+                       _n_exprs = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-            for n in _n_exprs do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_exprs)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ASelfExpr
     private init empty_init do end
 
     init init_aselfexpr (
-            n_kwself: nullable TKwself
+            n_kwself: nullable TKwself,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_kwself = n_kwself.as(not null)
        n_kwself.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6230,11 +8703,38 @@ redef class ASelfExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwself=(node)
+               do
+                       _n_kwself = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwself)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AImplicitSelfExpr
@@ -6249,6 +8749,8 @@ redef class AImplicitSelfExpr
     do
     end
 
+
+
     redef fun visit_all(v: Visitor)
     do
     end
@@ -6257,12 +8759,17 @@ redef class ATrueExpr
     private init empty_init do end
 
     init init_atrueexpr (
-            n_kwtrue: nullable TKwtrue
+            n_kwtrue: nullable TKwtrue,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_kwtrue = n_kwtrue.as(not null)
        n_kwtrue.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6277,23 +8784,55 @@ redef class ATrueExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwtrue=(node)
+               do
+                       _n_kwtrue = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwtrue)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AFalseExpr
     private init empty_init do end
 
     init init_afalseexpr (
-            n_kwfalse: nullable TKwfalse
+            n_kwfalse: nullable TKwfalse,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_kwfalse = n_kwfalse.as(not null)
        n_kwfalse.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6308,23 +8847,55 @@ redef class AFalseExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwfalse=(node)
+               do
+                       _n_kwfalse = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwfalse)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ANullExpr
     private init empty_init do end
 
     init init_anullexpr (
-            n_kwnull: nullable TKwnull
+            n_kwnull: nullable TKwnull,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_kwnull = n_kwnull.as(not null)
        n_kwnull.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6339,23 +8910,55 @@ redef class ANullExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_kwnull=(node)
+               do
+                       _n_kwnull = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_kwnull)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AIntExpr
     private init empty_init do end
 
     init init_aintexpr (
-            n_number: nullable TNumber
+            n_number: nullable TNumber,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_number = n_number.as(not null)
        n_number.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6370,23 +8973,55 @@ redef class AIntExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_number=(node)
+               do
+                       _n_number = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_number)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AFloatExpr
     private init empty_init do end
 
     init init_afloatexpr (
-            n_float: nullable TFloat
+            n_float: nullable TFloat,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_float = n_float.as(not null)
        n_float.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6401,23 +9036,55 @@ redef class AFloatExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_float=(node)
+               do
+                       _n_float = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_float)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class ACharExpr
     private init empty_init do end
 
     init init_acharexpr (
-            n_char: nullable TChar
+            n_char: nullable TChar,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_char = n_char.as(not null)
        n_char.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6432,23 +9099,55 @@ redef class ACharExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_char=(node)
+               do
+                       _n_char = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_char)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AStringExpr
     private init empty_init do end
 
     init init_astringexpr (
-            n_string: nullable TString
+            n_string: nullable TString,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
         _n_string = n_string.as(not null)
        n_string.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6463,11 +9162,38 @@ redef class AStringExpr
             end
             return
        end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_string=(node)
+               do
+                       _n_string = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_string)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AStartStringExpr
@@ -6496,6 +9222,13 @@ redef class AStartStringExpr
        end
     end
 
+               redef fun n_string=(node)
+               do
+                       _n_string = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_string)
@@ -6527,6 +9260,13 @@ redef class AMidStringExpr
        end
     end
 
+               redef fun n_string=(node)
+               do
+                       _n_string = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_string)
@@ -6558,6 +9298,13 @@ redef class AEndStringExpr
        end
     end
 
+               redef fun n_string=(node)
+               do
+                       _n_string = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_string)
@@ -6567,7 +9314,8 @@ redef class ASuperstringExpr
     private init empty_init do end
 
     init init_asuperstringexpr (
-            n_exprs: Collection[Object] # Should be Collection[AExpr]
+            n_exprs: Collection[Object], # Should be Collection[AExpr]
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
@@ -6576,6 +9324,10 @@ redef class ASuperstringExpr
                _n_exprs.add(n)
                n.parent = self
        end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6592,29 +9344,72 @@ redef class ASuperstringExpr
                 return
             end
         end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
             for n in _n_exprs do
                 v.enter_visit(n)
            end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AParExpr
     private init empty_init do end
 
     init init_aparexpr (
-            n_expr: nullable AExpr
+            n_opar: nullable TOpar,
+            n_expr: nullable AExpr,
+            n_cpar: nullable TCpar,
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
+        _n_opar = n_opar.as(not null)
+       n_opar.parent = self
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
+        _n_cpar = n_cpar.as(not null)
+       n_cpar.parent = self
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               abort
+            end
+            return
+       end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6625,11 +9420,60 @@ redef class AParExpr
             end
             return
        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
     end
 
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       node.parent = self
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
+        v.enter_visit(_n_opar)
         v.enter_visit(_n_expr)
+        v.enter_visit(_n_cpar)
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
     end
 end
 redef class AAsCastExpr
@@ -6638,7 +9482,9 @@ redef class AAsCastExpr
     init init_aascastexpr (
             n_expr: nullable AExpr,
             n_kwas: nullable TKwas,
-            n_type: nullable AType
+            n_opar: nullable TOpar,
+            n_type: nullable AType,
+            n_cpar: nullable TCpar
     )
     do
         empty_init
@@ -6646,8 +9492,12 @@ redef class AAsCastExpr
        n_expr.parent = self
         _n_kwas = n_kwas.as(not null)
        n_kwas.parent = self
+        _n_opar = n_opar.as(not null)
+       n_opar.parent = self
         _n_type = n_type.as(not null)
        n_type.parent = self
+        _n_cpar = n_cpar.as(not null)
+       n_cpar.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6672,6 +9522,16 @@ redef class AAsCastExpr
             end
             return
        end
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               abort
+            end
+            return
+       end
         if _n_type == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6682,13 +9542,52 @@ redef class AAsCastExpr
             end
             return
        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               abort
+            end
+            return
+       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwas=(node)
+               do
+                       _n_kwas = node
+                       node.parent = self
+               end
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_kwas)
+        v.enter_visit(_n_opar)
         v.enter_visit(_n_type)
+        v.enter_visit(_n_cpar)
     end
 end
 redef class AAsNotnullExpr
@@ -6697,8 +9596,10 @@ redef class AAsNotnullExpr
     init init_aasnotnullexpr (
             n_expr: nullable AExpr,
             n_kwas: nullable TKwas,
+            n_opar: nullable TOpar,
             n_kwnot: nullable TKwnot,
-            n_kwnull: nullable TKwnull
+            n_kwnull: nullable TKwnull,
+            n_cpar: nullable TCpar
     )
     do
         empty_init
@@ -6706,10 +9607,14 @@ redef class AAsNotnullExpr
        n_expr.parent = self
         _n_kwas = n_kwas.as(not null)
        n_kwas.parent = self
+        _n_opar = n_opar.as(not null)
+       n_opar.parent = self
         _n_kwnot = n_kwnot.as(not null)
        n_kwnot.parent = self
         _n_kwnull = n_kwnull.as(not null)
        n_kwnull.parent = self
+        _n_cpar = n_cpar.as(not null)
+       n_cpar.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6734,7 +9639,17 @@ redef class AAsNotnullExpr
             end
             return
        end
-        if _n_kwnot == old_child then
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwnot == old_child then
             if new_child != null then
                 new_child.parent = self
                assert new_child isa TKwnot
@@ -6754,46 +9669,1658 @@ redef class AAsNotnullExpr
             end
             return
        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_kwas=(node)
+               do
+                       _n_kwas = node
+                       node.parent = self
+               end
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       node.parent = self
+               end
+               redef fun n_kwnot=(node)
+               do
+                       _n_kwnot = node
+                       node.parent = self
+               end
+               redef fun n_kwnull=(node)
+               do
+                       _n_kwnull = node
+                       node.parent = self
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_expr)
+        v.enter_visit(_n_kwas)
+        v.enter_visit(_n_opar)
+        v.enter_visit(_n_kwnot)
+        v.enter_visit(_n_kwnull)
+        v.enter_visit(_n_cpar)
+    end
+end
+redef class AIssetAttrExpr
+    private init empty_init do end
+
+    init init_aissetattrexpr (
+            n_kwisset: nullable TKwisset,
+            n_expr: nullable AExpr,
+            n_id: nullable TAttrid
+    )
+    do
+        empty_init
+        _n_kwisset = n_kwisset.as(not null)
+       n_kwisset.parent = self
+        _n_expr = n_expr.as(not null)
+       n_expr.parent = self
+        _n_id = n_id.as(not null)
+       n_id.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwisset == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwisset
+                _n_kwisset = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_expr == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_id == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TAttrid
+                _n_id = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_kwisset=(node)
+               do
+                       _n_kwisset = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwisset)
+        v.enter_visit(_n_expr)
+        v.enter_visit(_n_id)
+    end
+end
+redef class ADebugTypeExpr
+    private init empty_init do end
+
+    init init_adebugtypeexpr (
+            n_kwdebug: nullable TKwdebug,
+            n_kwtype: nullable TKwtype,
+            n_expr: nullable AExpr,
+            n_type: nullable AType
+    )
+    do
+        empty_init
+        _n_kwdebug = n_kwdebug.as(not null)
+       n_kwdebug.parent = self
+        _n_kwtype = n_kwtype.as(not null)
+       n_kwtype.parent = self
+        _n_expr = n_expr.as(not null)
+       n_expr.parent = self
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwdebug == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwdebug
+                _n_kwdebug = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwtype == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwtype
+                _n_kwtype = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_expr == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExpr
+                _n_expr = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_kwdebug=(node)
+               do
+                       _n_kwdebug = node
+                       node.parent = self
+               end
+               redef fun n_kwtype=(node)
+               do
+                       _n_kwtype = node
+                       node.parent = self
+               end
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwdebug)
+        v.enter_visit(_n_kwtype)
+        v.enter_visit(_n_expr)
+        v.enter_visit(_n_type)
+    end
+end
+redef class AListExprs
+    private init empty_init do end
+
+    init init_alistexprs (
+            n_exprs: Collection[Object] # Should be Collection[AExpr]
+    )
+    do
+        empty_init
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+    end
+
+
+
+    redef fun visit_all(v: Visitor)
+    do
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+    end
+end
+redef class AParExprs
+    private init empty_init do end
+
+    init init_aparexprs (
+            n_opar: nullable TOpar,
+            n_exprs: Collection[Object], # Should be Collection[AExpr]
+            n_cpar: nullable TCpar
+    )
+    do
+        empty_init
+        _n_opar = n_opar.as(not null)
+       n_opar.parent = self
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+        _n_cpar = n_cpar.as(not null)
+       n_cpar.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               abort
+            end
+            return
+       end
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       node.parent = self
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_opar)
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+        v.enter_visit(_n_cpar)
     end
+end
+redef class ABraExprs
+    private init empty_init do end
+
+    init init_abraexprs (
+            n_obra: nullable TObra,
+            n_exprs: Collection[Object], # Should be Collection[AExpr]
+            n_cbra: nullable TCbra
+    )
+    do
+        empty_init
+        _n_obra = n_obra.as(not null)
+       n_obra.parent = self
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+        _n_cbra = n_cbra.as(not null)
+       n_cbra.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_obra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TObra
+                _n_obra = new_child
+           else
+               abort
+            end
+            return
+       end
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cbra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCbra
+                _n_cbra = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_obra=(node)
+               do
+                       _n_obra = node
+                       node.parent = self
+               end
+               redef fun n_cbra=(node)
+               do
+                       _n_cbra = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_obra)
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+        v.enter_visit(_n_cbra)
+    end
+end
+redef class APlusAssignOp
+    private init empty_init do end
+
+    init init_aplusassignop (
+            n_pluseq: nullable TPluseq
+    )
+    do
+        empty_init
+        _n_pluseq = n_pluseq.as(not null)
+       n_pluseq.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_pluseq == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TPluseq
+                _n_pluseq = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_pluseq=(node)
+               do
+                       _n_pluseq = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_pluseq)
+    end
+end
+redef class AMinusAssignOp
+    private init empty_init do end
+
+    init init_aminusassignop (
+            n_minuseq: nullable TMinuseq
+    )
+    do
+        empty_init
+        _n_minuseq = n_minuseq.as(not null)
+       n_minuseq.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_minuseq == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TMinuseq
+                _n_minuseq = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_minuseq=(node)
+               do
+                       _n_minuseq = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_minuseq)
+    end
+end
+redef class AModuleName
+    private init empty_init do end
+
+    init init_amodulename (
+            n_quad: nullable TQuad,
+            n_path: Collection[Object], # Should be Collection[TId]
+            n_id: nullable TId
+    )
+    do
+        empty_init
+        _n_quad = n_quad
+       if n_quad != null then
+               n_quad.parent = self
+       end
+       for n in n_path do
+               assert n isa TId
+               _n_path.add(n)
+               n.parent = self
+       end
+        _n_id = n_id.as(not null)
+       n_id.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_quad == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TQuad
+                _n_quad = new_child
+           else
+               _n_quad = null
+            end
+            return
+       end
+        for i in [0.._n_path.length[ do
+            if _n_path[i] == old_child then
+                if new_child != null then
+                   assert new_child isa TId
+                    _n_path[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_path.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_id == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TId
+                _n_id = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_quad=(node)
+               do
+                       _n_quad = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        if _n_quad != null then
+            v.enter_visit(_n_quad.as(not null))
+        end
+            for n in _n_path do
+                v.enter_visit(n)
+           end
+        v.enter_visit(_n_id)
+    end
+end
+redef class AExternCalls
+    private init empty_init do end
+
+    init init_aexterncalls (
+            n_kwimport: nullable TKwimport,
+            n_extern_calls: Collection[Object] # Should be Collection[AExternCall]
+    )
+    do
+        empty_init
+        _n_kwimport = n_kwimport.as(not null)
+       n_kwimport.parent = self
+       for n in n_extern_calls do
+               assert n isa AExternCall
+               _n_extern_calls.add(n)
+               n.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwimport == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwimport
+                _n_kwimport = new_child
+           else
+               abort
+            end
+            return
+       end
+        for i in [0.._n_extern_calls.length[ do
+            if _n_extern_calls[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExternCall
+                    _n_extern_calls[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_extern_calls.remove_at(i)
+                end
+                return
+            end
+        end
+    end
+
+               redef fun n_kwimport=(node)
+               do
+                       _n_kwimport = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwimport)
+            for n in _n_extern_calls do
+                v.enter_visit(n)
+           end
+    end
+end
+redef class AExternCall
+    private init empty_init do end
+
+    init init_aexterncall
+    do
+        empty_init
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+    end
+
+
+
+    redef fun visit_all(v: Visitor)
+    do
+    end
+end
+redef class ASuperExternCall
+    private init empty_init do end
+
+    init init_asuperexterncall (
+            n_kwsuper: nullable TKwsuper
+    )
+    do
+        empty_init
+        _n_kwsuper = n_kwsuper.as(not null)
+       n_kwsuper.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwsuper == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwsuper
+                _n_kwsuper = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_kwsuper=(node)
+               do
+                       _n_kwsuper = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwsuper)
+    end
+end
+redef class ALocalPropExternCall
+    private init empty_init do end
+
+    init init_alocalpropexterncall (
+            n_methid: nullable AMethid
+    )
+    do
+        empty_init
+        _n_methid = n_methid.as(not null)
+       n_methid.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_methid == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AMethid
+                _n_methid = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_methid)
+    end
+end
+redef class AFullPropExternCall
+    private init empty_init do end
+
+    init init_afullpropexterncall (
+            n_type: nullable AType,
+            n_dot: nullable TDot,
+            n_methid: nullable AMethid
+    )
+    do
+        empty_init
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+        _n_dot = n_dot
+       if n_dot != null then
+               n_dot.parent = self
+       end
+        _n_methid = n_methid.as(not null)
+       n_methid.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_dot == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TDot
+                _n_dot = new_child
+           else
+               _n_dot = null
+            end
+            return
+       end
+        if _n_methid == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AMethid
+                _n_methid = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_dot=(node)
+               do
+                       _n_dot = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_methid=(node)
+               do
+                       _n_methid = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_type)
+        if _n_dot != null then
+            v.enter_visit(_n_dot.as(not null))
+        end
+        v.enter_visit(_n_methid)
+    end
+end
+redef class AInitPropExternCall
+    private init empty_init do end
+
+    init init_ainitpropexterncall (
+            n_type: nullable AType
+    )
+    do
+        empty_init
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_type)
+    end
+end
+redef class ACastAsExternCall
+    private init empty_init do end
+
+    init init_acastasexterncall (
+            n_from_type: nullable AType,
+            n_dot: nullable TDot,
+            n_kwas: nullable TKwas,
+            n_to_type: nullable AType
+    )
+    do
+        empty_init
+        _n_from_type = n_from_type.as(not null)
+       n_from_type.parent = self
+        _n_dot = n_dot
+       if n_dot != null then
+               n_dot.parent = self
+       end
+        _n_kwas = n_kwas.as(not null)
+       n_kwas.parent = self
+        _n_to_type = n_to_type.as(not null)
+       n_to_type.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_from_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_from_type = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_dot == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TDot
+                _n_dot = new_child
+           else
+               _n_dot = null
+            end
+            return
+       end
+        if _n_kwas == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwas
+                _n_kwas = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_to_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_to_type = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_from_type=(node)
+               do
+                       _n_from_type = node
+                       node.parent = self
+               end
+               redef fun n_dot=(node)
+               do
+                       _n_dot = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_kwas=(node)
+               do
+                       _n_kwas = node
+                       node.parent = self
+               end
+               redef fun n_to_type=(node)
+               do
+                       _n_to_type = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_from_type)
+        if _n_dot != null then
+            v.enter_visit(_n_dot.as(not null))
+        end
+        v.enter_visit(_n_kwas)
+        v.enter_visit(_n_to_type)
+    end
+end
+redef class AAsNullableExternCall
+    private init empty_init do end
+
+    init init_aasnullableexterncall (
+            n_type: nullable AType,
+            n_kwas: nullable TKwas,
+            n_kwnullable: nullable TKwnullable
+    )
+    do
+        empty_init
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+        _n_kwas = n_kwas.as(not null)
+       n_kwas.parent = self
+        _n_kwnullable = n_kwnullable.as(not null)
+       n_kwnullable.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwas == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwas
+                _n_kwas = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwnullable == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwnullable
+                _n_kwnullable = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_kwas=(node)
+               do
+                       _n_kwas = node
+                       node.parent = self
+               end
+               redef fun n_kwnullable=(node)
+               do
+                       _n_kwnullable = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_type)
+        v.enter_visit(_n_kwas)
+        v.enter_visit(_n_kwnullable)
+    end
+end
+redef class AAsNotNullableExternCall
+    private init empty_init do end
+
+    init init_aasnotnullableexterncall (
+            n_type: nullable AType,
+            n_kwas: nullable TKwas,
+            n_kwnot: nullable TKwnot,
+            n_kwnullable: nullable TKwnullable
+    )
+    do
+        empty_init
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+        _n_kwas = n_kwas.as(not null)
+       n_kwas.parent = self
+        _n_kwnot = n_kwnot.as(not null)
+       n_kwnot.parent = self
+        _n_kwnullable = n_kwnullable.as(not null)
+       n_kwnullable.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwas == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwas
+                _n_kwas = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwnot == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwnot
+                _n_kwnot = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_kwnullable == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwnullable
+                _n_kwnullable = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+               redef fun n_kwas=(node)
+               do
+                       _n_kwas = node
+                       node.parent = self
+               end
+               redef fun n_kwnot=(node)
+               do
+                       _n_kwnot = node
+                       node.parent = self
+               end
+               redef fun n_kwnullable=(node)
+               do
+                       _n_kwnullable = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_type)
+        v.enter_visit(_n_kwas)
+        v.enter_visit(_n_kwnot)
+        v.enter_visit(_n_kwnullable)
+    end
+end
+redef class AInLanguage
+    private init empty_init do end
+
+    init init_ainlanguage (
+            n_kwin: nullable TKwin,
+            n_string: nullable TString
+    )
+    do
+        empty_init
+        _n_kwin = n_kwin.as(not null)
+       n_kwin.parent = self
+        _n_string = n_string.as(not null)
+       n_string.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_kwin == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwin
+                _n_kwin = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_string == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TString
+                _n_string = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_kwin=(node)
+               do
+                       _n_kwin = node
+                       node.parent = self
+               end
+               redef fun n_string=(node)
+               do
+                       _n_string = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_kwin)
+        v.enter_visit(_n_string)
+    end
+end
+redef class AExternCodeBlock
+    private init empty_init do end
+
+    init init_aexterncodeblock (
+            n_in_language: nullable AInLanguage,
+            n_extern_code_segment: nullable TExternCodeSegment
+    )
+    do
+        empty_init
+        _n_in_language = n_in_language
+       if n_in_language != null then
+               n_in_language.parent = self
+       end
+        _n_extern_code_segment = n_extern_code_segment.as(not null)
+       n_extern_code_segment.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_in_language == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AInLanguage
+                _n_in_language = new_child
+           else
+               _n_in_language = null
+            end
+            return
+       end
+        if _n_extern_code_segment == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TExternCodeSegment
+                _n_extern_code_segment = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_in_language=(node)
+               do
+                       _n_in_language = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_extern_code_segment=(node)
+               do
+                       _n_extern_code_segment = node
+                       node.parent = self
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        if _n_in_language != null then
+            v.enter_visit(_n_in_language.as(not null))
+        end
+        v.enter_visit(_n_extern_code_segment)
+    end
+end
+redef class AQualified
+    private init empty_init do end
+
+    init init_aqualified (
+            n_id: Collection[Object], # Should be Collection[TId]
+            n_classid: nullable TClassid
+    )
+    do
+        empty_init
+       for n in n_id do
+               assert n isa TId
+               _n_id.add(n)
+               n.parent = self
+       end
+        _n_classid = n_classid
+       if n_classid != null then
+               n_classid.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        for i in [0.._n_id.length[ do
+            if _n_id[i] == old_child then
+                if new_child != null then
+                   assert new_child isa TId
+                    _n_id[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_id.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_classid == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TClassid
+                _n_classid = new_child
+           else
+               _n_classid = null
+            end
+            return
+       end
+    end
+
+               redef fun n_classid=(node)
+               do
+                       _n_classid = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+            for n in _n_id do
+                v.enter_visit(n)
+           end
+        if _n_classid != null then
+            v.enter_visit(_n_classid.as(not null))
+        end
+    end
+end
+redef class ADoc
+    private init empty_init do end
+
+    init init_adoc (
+            n_comment: Collection[Object] # Should be Collection[TComment]
+    )
+    do
+        empty_init
+       for n in n_comment do
+               assert n isa TComment
+               _n_comment.add(n)
+               n.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        for i in [0.._n_comment.length[ do
+            if _n_comment[i] == old_child then
+                if new_child != null then
+                   assert new_child isa TComment
+                    _n_comment[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_comment.remove_at(i)
+                end
+                return
+            end
+        end
+    end
+
+
+
+    redef fun visit_all(v: Visitor)
+    do
+            for n in _n_comment do
+                v.enter_visit(n)
+           end
+    end
+end
+redef class AAnnotations
+    private init empty_init do end
+
+    init init_aannotations (
+            n_at: nullable TAt,
+            n_opar: nullable TOpar,
+            n_items: Collection[Object], # Should be Collection[AAnnotation]
+            n_cpar: nullable TCpar
+    )
+    do
+        empty_init
+        _n_at = n_at
+       if n_at != null then
+               n_at.parent = self
+       end
+        _n_opar = n_opar
+       if n_opar != null then
+               n_opar.parent = self
+       end
+       for n in n_items do
+               assert n isa AAnnotation
+               _n_items.add(n)
+               n.parent = self
+       end
+        _n_cpar = n_cpar
+       if n_cpar != null then
+               n_cpar.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_at == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TAt
+                _n_at = new_child
+           else
+               _n_at = null
+            end
+            return
+       end
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               _n_opar = null
+            end
+            return
+       end
+        for i in [0.._n_items.length[ do
+            if _n_items[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AAnnotation
+                    _n_items[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_items.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               _n_cpar = null
+            end
+            return
+       end
+    end
+
+               redef fun n_at=(node)
+               do
+                       _n_at = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        if _n_at != null then
+            v.enter_visit(_n_at.as(not null))
+        end
+        if _n_opar != null then
+            v.enter_visit(_n_opar.as(not null))
+        end
+            for n in _n_items do
+                v.enter_visit(n)
+           end
+        if _n_cpar != null then
+            v.enter_visit(_n_cpar.as(not null))
+        end
+    end
+end
+redef class AAnnotation
+    private init empty_init do end
+
+    init init_aannotation (
+            n_atid: nullable AAtid,
+            n_opar: nullable TOpar,
+            n_args: Collection[Object], # Should be Collection[AAtArg]
+            n_cpar: nullable TCpar,
+            n_annotations: nullable AAnnotations
+    )
+    do
+        empty_init
+        _n_atid = n_atid.as(not null)
+       n_atid.parent = self
+        _n_opar = n_opar
+       if n_opar != null then
+               n_opar.parent = self
+       end
+       for n in n_args do
+               assert n isa AAtArg
+               _n_args.add(n)
+               n.parent = self
+       end
+        _n_cpar = n_cpar
+       if n_cpar != null then
+               n_cpar.parent = self
+       end
+        _n_annotations = n_annotations
+       if n_annotations != null then
+               n_annotations.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_atid == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAtid
+                _n_atid = new_child
+           else
+               abort
+            end
+            return
+       end
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               _n_opar = null
+            end
+            return
+       end
+        for i in [0.._n_args.length[ do
+            if _n_args[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AAtArg
+                    _n_args[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_args.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               _n_cpar = null
+            end
+            return
+       end
+        if _n_annotations == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
+           else
+               _n_annotations = null
+            end
+            return
+       end
+    end
+
+               redef fun n_atid=(node)
+               do
+                       _n_atid = node
+                       node.parent = self
+               end
+               redef fun n_opar=(node)
+               do
+                       _n_opar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_cpar=(node)
+               do
+                       _n_cpar = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       if node != null then
+                               node.parent = self
+                       end
+               end
+
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_atid)
+        if _n_opar != null then
+            v.enter_visit(_n_opar.as(not null))
+        end
+            for n in _n_args do
+                v.enter_visit(n)
+           end
+        if _n_cpar != null then
+            v.enter_visit(_n_cpar.as(not null))
+        end
+        if _n_annotations != null then
+            v.enter_visit(_n_annotations.as(not null))
+        end
+    end
+end
+redef class ATypeAtArg
+    private init empty_init do end
+
+    init init_atypeatarg (
+            n_type: nullable AType
+    )
+    do
+        empty_init
+        _n_type = n_type.as(not null)
+       n_type.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_type == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AType
+                _n_type = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+               redef fun n_type=(node)
+               do
+                       _n_type = node
+                       node.parent = self
+               end
+
 
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_expr)
-        v.enter_visit(_n_kwas)
-        v.enter_visit(_n_kwnot)
-        v.enter_visit(_n_kwnull)
+        v.enter_visit(_n_type)
     end
 end
-redef class AIssetAttrExpr
+redef class AExprAtArg
     private init empty_init do end
 
-    init init_aissetattrexpr (
-            n_kwisset: nullable TKwisset,
-            n_expr: nullable AExpr,
-            n_id: nullable TAttrid
+    init init_aexpratarg (
+            n_expr: nullable AExpr
     )
     do
         empty_init
-        _n_kwisset = n_kwisset.as(not null)
-       n_kwisset.parent = self
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_kwisset == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TKwisset
-                _n_kwisset = new_child
-           else
-               abort
-            end
-            return
-       end
         if _n_expr == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6804,44 +11331,39 @@ redef class AIssetAttrExpr
             end
             return
        end
-        if _n_id == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TAttrid
-                _n_id = new_child
-           else
-               abort
-            end
-            return
-       end
     end
 
+               redef fun n_expr=(node)
+               do
+                       _n_expr = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_kwisset)
         v.enter_visit(_n_expr)
-        v.enter_visit(_n_id)
     end
 end
-redef class APlusAssignOp
+redef class AAtAtArg
     private init empty_init do end
 
-    init init_aplusassignop (
-            n_pluseq: nullable TPluseq
+    init init_aatatarg (
+            n_annotations: nullable AAnnotations
     )
     do
         empty_init
-        _n_pluseq = n_pluseq.as(not null)
-       n_pluseq.parent = self
+        _n_annotations = n_annotations.as(not null)
+       n_annotations.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_pluseq == old_child then
+        if _n_annotations == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TPluseq
-                _n_pluseq = new_child
+               assert new_child isa AAnnotations
+                _n_annotations = new_child
            else
                abort
             end
@@ -6849,30 +11371,37 @@ redef class APlusAssignOp
        end
     end
 
+               redef fun n_annotations=(node)
+               do
+                       _n_annotations = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_pluseq)
+        v.enter_visit(_n_annotations)
     end
 end
-redef class AMinusAssignOp
+redef class AIdAtid
     private init empty_init do end
 
-    init init_aminusassignop (
-            n_minuseq: nullable TMinuseq
+    init init_aidatid (
+            n_id: nullable TId
     )
     do
         empty_init
-        _n_minuseq = n_minuseq.as(not null)
-       n_minuseq.parent = self
+        _n_id = n_id.as(not null)
+       n_id.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_minuseq == old_child then
+        if _n_id == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TMinuseq
-                _n_minuseq = new_child
+               assert new_child isa TId
+                _n_id = new_child
            else
                abort
             end
@@ -6880,136 +11409,61 @@ redef class AMinusAssignOp
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_minuseq)
+        v.enter_visit(_n_id)
     end
 end
-redef class AClosureDef
+redef class AKwexternAtid
     private init empty_init do end
 
-    init init_aclosuredef (
-            n_bang: nullable TBang,
-            n_id: nullable AClosureId,
-            n_ids: Collection[Object], # Should be Collection[TId]
-            n_kwdo: nullable TKwdo,
-            n_expr: nullable AExpr,
-            n_label: nullable ALabel
+    init init_akwexternatid (
+            n_id: nullable TKwextern
     )
     do
         empty_init
-        _n_bang = n_bang.as(not null)
-       n_bang.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_ids do
-               assert n isa TId
-               _n_ids.add(n)
-               n.parent = self
-       end
-        _n_kwdo = n_kwdo
-       if n_kwdo != null then
-               n_kwdo.parent = self
-       end
-        _n_expr = n_expr
-       if n_expr != null then
-               n_expr.parent = self
-       end
-        _n_label = n_label
-       if n_label != null then
-               n_label.parent = self
-       end
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_bang == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TBang
-                _n_bang = new_child
-           else
-               abort
-            end
-            return
-       end
         if _n_id == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa AClosureId
+               assert new_child isa TKwextern
                 _n_id = new_child
            else
                abort
             end
             return
        end
-        for i in [0.._n_ids.length[ do
-            if _n_ids[i] == old_child then
-                if new_child != null then
-                   assert new_child isa TId
-                    _n_ids[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_ids.remove_at(i)
-                end
-                return
-            end
-        end
-        if _n_kwdo == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa TKwdo
-                _n_kwdo = new_child
-           else
-               _n_kwdo = null
-            end
-            return
-       end
-        if _n_expr == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa AExpr
-                _n_expr = new_child
-           else
-               _n_expr = null
-            end
-            return
-       end
-        if _n_label == old_child then
-            if new_child != null then
-                new_child.parent = self
-               assert new_child isa ALabel
-                _n_label = new_child
-           else
-               _n_label = null
-            end
-            return
-       end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_bang)
         v.enter_visit(_n_id)
-            for n in _n_ids do
-                v.enter_visit(n)
-           end
-        if _n_kwdo != null then
-            v.enter_visit(_n_kwdo.as(not null))
-        end
-        if _n_expr != null then
-            v.enter_visit(_n_expr.as(not null))
-        end
-        if _n_label != null then
-            v.enter_visit(_n_label.as(not null))
-        end
     end
 end
-redef class ASimpleClosureId
+redef class AKwinternAtid
     private init empty_init do end
 
-    init init_asimpleclosureid (
-            n_id: nullable TId
+    init init_akwinternatid (
+            n_id: nullable TKwintern
     )
     do
         empty_init
@@ -7022,7 +11476,7 @@ redef class ASimpleClosureId
         if _n_id == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TId
+               assert new_child isa TKwintern
                 _n_id = new_child
            else
                abort
@@ -7031,30 +11485,37 @@ redef class ASimpleClosureId
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
     end
 end
-redef class ABreakClosureId
+redef class AKwreadableAtid
     private init empty_init do end
 
-    init init_abreakclosureid (
-            n_kwbreak: nullable TKwbreak
+    init init_akwreadableatid (
+            n_id: nullable TKwreadable
     )
     do
         empty_init
-        _n_kwbreak = n_kwbreak.as(not null)
-       n_kwbreak.parent = self
+        _n_id = n_id.as(not null)
+       n_id.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        if _n_kwbreak == old_child then
+        if _n_id == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TKwbreak
-                _n_kwbreak = new_child
+               assert new_child isa TKwreadable
+                _n_id = new_child
            else
                abort
             end
@@ -7062,115 +11523,96 @@ redef class ABreakClosureId
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-        v.enter_visit(_n_kwbreak)
+        v.enter_visit(_n_id)
     end
 end
-redef class AQualified
+redef class AKwwritableAtid
     private init empty_init do end
 
-    init init_aqualified (
-            n_id: Collection[Object], # Should be Collection[TId]
-            n_classid: nullable TClassid
+    init init_akwwritableatid (
+            n_id: nullable TKwwritable
     )
     do
         empty_init
-       for n in n_id do
-               assert n isa TId
-               _n_id.add(n)
-               n.parent = self
-       end
-        _n_classid = n_classid
-       if n_classid != null then
-               n_classid.parent = self
-       end
+        _n_id = n_id.as(not null)
+       n_id.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        for i in [0.._n_id.length[ do
-            if _n_id[i] == old_child then
-                if new_child != null then
-                   assert new_child isa TId
-                    _n_id[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_id.remove_at(i)
-                end
-                return
-            end
-        end
-        if _n_classid == old_child then
+        if _n_id == old_child then
             if new_child != null then
                 new_child.parent = self
-               assert new_child isa TClassid
-                _n_classid = new_child
+               assert new_child isa TKwwritable
+                _n_id = new_child
            else
-               _n_classid = null
+               abort
             end
             return
        end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-            for n in _n_id do
-                v.enter_visit(n)
-           end
-        if _n_classid != null then
-            v.enter_visit(_n_classid.as(not null))
-        end
+        v.enter_visit(_n_id)
     end
 end
-redef class ADoc
+redef class AKwimportAtid
     private init empty_init do end
 
-    init init_adoc (
-            n_comment: Collection[Object] # Should be Collection[TComment]
+    init init_akwimportatid (
+            n_id: nullable TKwimport
     )
     do
         empty_init
-       for n in n_comment do
-               assert n isa TComment
-               _n_comment.add(n)
-               n.parent = self
-       end
+        _n_id = n_id.as(not null)
+       n_id.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        for i in [0.._n_comment.length[ do
-            if _n_comment[i] == old_child then
-                if new_child != null then
-                   assert new_child isa TComment
-                    _n_comment[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_comment.remove_at(i)
-                end
-                return
+        if _n_id == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TKwimport
+                _n_id = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
+               redef fun n_id=(node)
+               do
+                       _n_id = node
+                       node.parent = self
+               end
+
+
     redef fun visit_all(v: Visitor)
     do
-            for n in _n_comment do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_id)
     end
 end
 
 redef class Start
-    init(
-        n_base: nullable AModule,
-        n_eof: EOF)
-    do
-        _n_base = n_base
-        _n_eof = n_eof
-    end
-
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
         if _n_base == old_child then