parser: regenerate with multi-iterators
[nit.git] / src / parser / parser_prod.nit
index 588d266..740278e 100644 (file)
@@ -1,6 +1,6 @@
 # Production AST nodes full definition.
 # This file was generated by SableCC (http://www.sablecc.org/).
-module parser_prod
+module parser_prod is no_warning("missing-doc")
 
 import lexer
 intrude import parser_nodes
@@ -16,9 +16,9 @@ redef class AModule
        do
                _n_moduledecl = n_moduledecl
                if n_moduledecl != null then n_moduledecl.parent = self
-               _n_imports.unsafe_add_all(n_imports)
-               _n_extern_code_blocks.unsafe_add_all(n_extern_code_blocks)
-               _n_classdefs.unsafe_add_all(n_classdefs)
+               self.n_imports.unsafe_add_all(n_imports)
+               self.n_extern_code_blocks.unsafe_add_all(n_extern_code_blocks)
+               self.n_classdefs.unsafe_add_all(n_classdefs)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -27,9 +27,9 @@ redef class AModule
                        n_moduledecl = new_child.as(nullable AModuledecl)
                        return
                end
-               if _n_imports.replace_child(old_child, new_child) then return
-               if _n_extern_code_blocks.replace_child(old_child, new_child) then return
-               if _n_classdefs.replace_child(old_child, new_child) then return
+               if n_imports.replace_child(old_child, new_child) then return
+               if n_extern_code_blocks.replace_child(old_child, new_child) then return
+               if n_classdefs.replace_child(old_child, new_child) then return
        end
 
        redef fun n_moduledecl=(node)
@@ -42,14 +42,16 @@ redef class AModule
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_moduledecl)
-               _n_imports.visit_all(v)
-               _n_extern_code_blocks.visit_all(v)
-               _n_classdefs.visit_all(v)
+               n_imports.visit_all(v)
+               n_extern_code_blocks.visit_all(v)
+               n_classdefs.visit_all(v)
        end
 end
 redef class AModuledecl
        init init_amoduledecl (
                n_doc: nullable ADoc,
+               n_kwredef: nullable TKwredef,
+               n_visibility: nullable AVisibility,
                n_kwmodule: nullable TKwmodule,
                n_name: nullable AModuleName,
                n_annotations: nullable AAnnotations
@@ -57,6 +59,10 @@ redef class AModuledecl
        do
                _n_doc = n_doc
                if n_doc != null then n_doc.parent = self
+               _n_kwredef = n_kwredef
+               if n_kwredef != null then n_kwredef.parent = self
+               _n_visibility = n_visibility.as(not null)
+               n_visibility.parent = self
                _n_kwmodule = n_kwmodule.as(not null)
                n_kwmodule.parent = self
                _n_name = n_name.as(not null)
@@ -71,6 +77,14 @@ redef class AModuledecl
                        n_doc = new_child.as(nullable ADoc)
                        return
                end
+               if _n_kwredef == old_child then
+                       n_kwredef = new_child.as(nullable TKwredef)
+                       return
+               end
+               if _n_visibility == old_child then
+                       n_visibility = new_child.as(AVisibility)
+                       return
+               end
                if _n_kwmodule == old_child then
                        n_kwmodule = new_child.as(TKwmodule)
                        return
@@ -90,6 +104,16 @@ redef class AModuledecl
                _n_doc = node
                if node != null then node.parent = self
        end
+       redef fun n_kwredef=(node)
+       do
+               _n_kwredef = node
+               if node != null then node.parent = self
+       end
+       redef fun n_visibility=(node)
+       do
+               _n_visibility = node
+               node.parent = self
+       end
        redef fun n_kwmodule=(node)
        do
                _n_kwmodule = node
@@ -110,6 +134,8 @@ redef class AModuledecl
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_doc)
+               v.enter_visit(_n_kwredef)
+               v.enter_visit(_n_visibility)
                v.enter_visit(_n_kwmodule)
                v.enter_visit(_n_name)
                v.enter_visit(_n_annotations)
@@ -239,18 +265,32 @@ redef class ANoImport
        end
 end
 redef class APublicVisibility
-       init init_apublicvisibility
+       init init_apublicvisibility (
+               n_kwpublic: nullable TKwpublic
+       )
        do
+               _n_kwpublic = n_kwpublic
+               if n_kwpublic != null then n_kwpublic.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
+               if _n_kwpublic == old_child then
+                       n_kwpublic = new_child.as(nullable TKwpublic)
+                       return
+               end
        end
 
+       redef fun n_kwpublic=(node)
+       do
+               _n_kwpublic = node
+               if node != null then node.parent = self
+       end
 
 
        redef fun visit_all(v: Visitor)
        do
+               v.enter_visit(_n_kwpublic)
        end
 end
 redef class APrivateVisibility
@@ -347,10 +387,10 @@ redef class AStdClassdef
                n_visibility: nullable AVisibility,
                n_classkind: nullable AClasskind,
                n_id: nullable TClassid,
+               n_obra: nullable TObra,
                n_formaldefs: Collection[Object], # Should be Collection[AFormaldef]
-               n_annotations: nullable AAnnotations,
+               n_cbra: nullable TCbra,
                n_extern_code_block: nullable AExternCodeBlock,
-               n_superclasses: Collection[Object], # Should be Collection[ASuperclass]
                n_propdefs: Collection[Object], # Should be Collection[APropdef]
                n_kwend: nullable TKwend
        )
@@ -365,13 +405,14 @@ redef class AStdClassdef
                n_classkind.parent = self
                _n_id = n_id
                if n_id != null then n_id.parent = self
-               _n_formaldefs.unsafe_add_all(n_formaldefs)
-               _n_annotations = n_annotations
-               if n_annotations != null then n_annotations.parent = self
+               _n_obra = n_obra
+               if n_obra != null then n_obra.parent = self
+               self.n_formaldefs.unsafe_add_all(n_formaldefs)
+               _n_cbra = n_cbra
+               if n_cbra != null then n_cbra.parent = self
                _n_extern_code_block = n_extern_code_block
                if n_extern_code_block != null then n_extern_code_block.parent = self
-               _n_superclasses.unsafe_add_all(n_superclasses)
-               _n_propdefs.unsafe_add_all(n_propdefs)
+               self.n_propdefs.unsafe_add_all(n_propdefs)
                _n_kwend = n_kwend.as(not null)
                n_kwend.parent = self
        end
@@ -398,17 +439,20 @@ redef class AStdClassdef
                        n_id = new_child.as(nullable TClassid)
                        return
                end
-               if _n_formaldefs.replace_child(old_child, new_child) then return
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
+               if _n_obra == old_child then
+                       n_obra = new_child.as(nullable TObra)
+                       return
+               end
+               if n_formaldefs.replace_child(old_child, new_child) then return
+               if _n_cbra == old_child then
+                       n_cbra = new_child.as(nullable TCbra)
                        return
                end
                if _n_extern_code_block == old_child then
                        n_extern_code_block = new_child.as(nullable AExternCodeBlock)
                        return
                end
-               if _n_superclasses.replace_child(old_child, new_child) then return
-               if _n_propdefs.replace_child(old_child, new_child) then return
+               if n_propdefs.replace_child(old_child, new_child) then return
                if _n_kwend == old_child then
                        n_kwend = new_child.as(TKwend)
                        return
@@ -440,9 +484,14 @@ redef class AStdClassdef
                _n_id = node
                if node != null then node.parent = self
        end
-       redef fun n_annotations=(node)
+       redef fun n_obra=(node)
        do
-               _n_annotations = node
+               _n_obra = node
+               if node != null then node.parent = self
+       end
+       redef fun n_cbra=(node)
+       do
+               _n_cbra = node
                if node != null then node.parent = self
        end
        redef fun n_extern_code_block=(node)
@@ -464,11 +513,11 @@ redef class AStdClassdef
                v.enter_visit(_n_visibility)
                v.enter_visit(_n_classkind)
                v.enter_visit(_n_id)
-               _n_formaldefs.visit_all(v)
-               v.enter_visit(_n_annotations)
+               v.enter_visit(_n_obra)
+               n_formaldefs.visit_all(v)
+               v.enter_visit(_n_cbra)
                v.enter_visit(_n_extern_code_block)
-               _n_superclasses.visit_all(v)
-               _n_propdefs.visit_all(v)
+               n_propdefs.visit_all(v)
                v.enter_visit(_n_kwend)
        end
 end
@@ -477,19 +526,19 @@ redef class ATopClassdef
                n_propdefs: Collection[Object] # Should be Collection[APropdef]
        )
        do
-               _n_propdefs.unsafe_add_all(n_propdefs)
+               self.n_propdefs.unsafe_add_all(n_propdefs)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_propdefs.replace_child(old_child, new_child) then return
+               if n_propdefs.replace_child(old_child, new_child) then return
        end
 
 
 
        redef fun visit_all(v: Visitor)
        do
-               _n_propdefs.visit_all(v)
+               n_propdefs.visit_all(v)
        end
 end
 redef class AMainClassdef
@@ -497,19 +546,19 @@ redef class AMainClassdef
                n_propdefs: Collection[Object] # Should be Collection[APropdef]
        )
        do
-               _n_propdefs.unsafe_add_all(n_propdefs)
+               self.n_propdefs.unsafe_add_all(n_propdefs)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_propdefs.replace_child(old_child, new_child) then return
+               if n_propdefs.replace_child(old_child, new_child) then return
        end
 
 
 
        redef fun visit_all(v: Visitor)
        do
-               _n_propdefs.visit_all(v)
+               n_propdefs.visit_all(v)
        end
 end
 redef class AConcreteClasskind
@@ -738,98 +787,46 @@ redef class AFormaldef
                v.enter_visit(_n_annotations)
        end
 end
-redef class ASuperclass
-       init init_asuperclass (
-               n_kwsuper: nullable TKwsuper,
-               n_type: nullable AType,
-               n_annotations: nullable AAnnotations
-       )
-       do
-               _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
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_kwsuper == old_child then
-                       n_kwsuper = new_child.as(TKwsuper)
-                       return
-               end
-               if _n_type == old_child then
-                       n_type = new_child.as(AType)
-                       return
-               end
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
-                       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
-
-
-       redef fun visit_all(v: Visitor)
-       do
-               v.enter_visit(_n_kwsuper)
-               v.enter_visit(_n_type)
-               v.enter_visit(_n_annotations)
-       end
-end
 redef class AAttrPropdef
        init init_aattrpropdef (
                n_doc: nullable ADoc,
-               n_readable: nullable AAble,
-               n_writable: nullable AAble,
                n_kwredef: nullable TKwredef,
                n_visibility: nullable AVisibility,
                n_kwvar: nullable TKwvar,
-               n_id: nullable TAttrid,
                n_id2: nullable TId,
                n_type: nullable AType,
+               n_assign: nullable TAssign,
+               n_expr: nullable AExpr,
                n_annotations: nullable AAnnotations,
-               n_expr: nullable AExpr
+               n_kwdo: nullable TKwdo,
+               n_block: nullable AExpr,
+               n_kwend: nullable TKwend
        )
        do
                _n_doc = n_doc
                if n_doc != null then n_doc.parent = self
-               _n_readable = n_readable
-               if n_readable != null then n_readable.parent = self
-               _n_writable = n_writable
-               if n_writable != null then n_writable.parent = self
                _n_kwredef = n_kwredef
                if n_kwredef != null then n_kwredef.parent = self
                _n_visibility = n_visibility.as(not null)
                n_visibility.parent = self
                _n_kwvar = n_kwvar.as(not null)
                n_kwvar.parent = self
-               _n_id = n_id
-               if n_id != null then n_id.parent = self
-               _n_id2 = n_id2
-               if n_id2 != null then n_id2.parent = self
+               _n_id2 = n_id2.as(not null)
+               n_id2.parent = self
                _n_type = n_type
                if n_type != null then n_type.parent = self
-               _n_annotations = n_annotations
-               if n_annotations != null then n_annotations.parent = self
+               _n_assign = n_assign
+               if n_assign != null then n_assign.parent = self
                _n_expr = n_expr
                if n_expr != null then n_expr.parent = self
+               _n_annotations = n_annotations
+               if n_annotations != null then n_annotations.parent = self
+               _n_kwdo = n_kwdo
+               if n_kwdo != null then n_kwdo.parent = self
+               _n_block = n_block
+               if n_block != null then n_block.parent = self
+               _n_kwend = n_kwend
+               if n_kwend != null then n_kwend.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -838,14 +835,6 @@ redef class AAttrPropdef
                        n_doc = new_child.as(nullable ADoc)
                        return
                end
-               if _n_readable == old_child then
-                       n_readable = new_child.as(nullable AAble)
-                       return
-               end
-               if _n_writable == old_child then
-                       n_writable = new_child.as(nullable AAble)
-                       return
-               end
                if _n_kwredef == old_child then
                        n_kwredef = new_child.as(nullable TKwredef)
                        return
@@ -858,26 +847,38 @@ redef class AAttrPropdef
                        n_kwvar = new_child.as(TKwvar)
                        return
                end
-               if _n_id == old_child then
-                       n_id = new_child.as(nullable TAttrid)
-                       return
-               end
                if _n_id2 == old_child then
-                       n_id2 = new_child.as(nullable TId)
+                       n_id2 = new_child.as(TId)
                        return
                end
                if _n_type == old_child then
                        n_type = new_child.as(nullable AType)
                        return
                end
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
+               if _n_assign == old_child then
+                       n_assign = new_child.as(nullable TAssign)
                        return
                end
                if _n_expr == old_child then
                        n_expr = new_child.as(nullable AExpr)
                        return
                end
+               if _n_annotations == old_child then
+                       n_annotations = new_child.as(nullable AAnnotations)
+                       return
+               end
+               if _n_kwdo == old_child then
+                       n_kwdo = new_child.as(nullable TKwdo)
+                       return
+               end
+               if _n_block == old_child then
+                       n_block = new_child.as(nullable AExpr)
+                       return
+               end
+               if _n_kwend == old_child then
+                       n_kwend = new_child.as(nullable TKwend)
+                       return
+               end
        end
 
        redef fun n_doc=(node)
@@ -885,16 +886,6 @@ redef class AAttrPropdef
                _n_doc = node
                if node != null then node.parent = self
        end
-       redef fun n_readable=(node)
-       do
-               _n_readable = node
-               if node != null then node.parent = self
-       end
-       redef fun n_writable=(node)
-       do
-               _n_writable = node
-               if node != null then node.parent = self
-       end
        redef fun n_kwredef=(node)
        do
                _n_kwredef = node
@@ -910,24 +901,19 @@ redef class AAttrPropdef
                _n_kwvar = node
                node.parent = self
        end
-       redef fun n_id=(node)
-       do
-               _n_id = node
-               if node != null then node.parent = self
-       end
        redef fun n_id2=(node)
        do
                _n_id2 = node
-               if node != null then node.parent = self
+               node.parent = self
        end
        redef fun n_type=(node)
        do
                _n_type = node
                if node != null then node.parent = self
        end
-       redef fun n_annotations=(node)
+       redef fun n_assign=(node)
        do
-               _n_annotations = node
+               _n_assign = node
                if node != null then node.parent = self
        end
        redef fun n_expr=(node)
@@ -935,112 +921,94 @@ redef class AAttrPropdef
                _n_expr = node
                if node != null then node.parent = self
        end
+       redef fun n_annotations=(node)
+       do
+               _n_annotations = node
+               if node != null then node.parent = self
+       end
+       redef fun n_kwdo=(node)
+       do
+               _n_kwdo = node
+               if node != null then node.parent = self
+       end
+       redef fun n_block=(node)
+       do
+               _n_block = node
+               if node != null then node.parent = self
+       end
+       redef fun n_kwend=(node)
+       do
+               _n_kwend = node
+               if node != null then node.parent = self
+       end
 
 
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_doc)
-               v.enter_visit(_n_readable)
-               v.enter_visit(_n_writable)
                v.enter_visit(_n_kwredef)
                v.enter_visit(_n_visibility)
                v.enter_visit(_n_kwvar)
-               v.enter_visit(_n_id)
                v.enter_visit(_n_id2)
                v.enter_visit(_n_type)
-               v.enter_visit(_n_annotations)
+               v.enter_visit(_n_assign)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_annotations)
+               v.enter_visit(_n_kwdo)
+               v.enter_visit(_n_block)
+               v.enter_visit(_n_kwend)
        end
 end
-redef class AMethPropdef
-       init init_amethpropdef (
-               n_doc: nullable ADoc,
+redef class AMainMethPropdef
+       init init_amainmethpropdef (
                n_kwredef: nullable TKwredef,
-               n_visibility: nullable AVisibility,
-               n_methid: nullable AMethid,
-               n_signature: nullable ASignature
+               n_block: nullable AExpr
        )
        do
-               _n_doc = n_doc
-               if n_doc != null then n_doc.parent = self
                _n_kwredef = n_kwredef
                if n_kwredef != null then n_kwredef.parent = self
-               _n_visibility = n_visibility.as(not null)
-               n_visibility.parent = self
-               _n_methid = n_methid.as(not null)
-               n_methid.parent = self
-               _n_signature = n_signature.as(not null)
-               n_signature.parent = self
+               _n_block = n_block
+               if n_block != null then n_block.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_doc == old_child then
-                       n_doc = new_child.as(nullable ADoc)
-                       return
-               end
                if _n_kwredef == old_child then
                        n_kwredef = new_child.as(nullable TKwredef)
                        return
                end
-               if _n_visibility == old_child then
-                       n_visibility = new_child.as(AVisibility)
-                       return
-               end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(AMethid)
-                       return
-               end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
+               if _n_block == old_child then
+                       n_block = new_child.as(nullable AExpr)
                        return
                end
        end
 
-       redef fun n_doc=(node)
-       do
-               _n_doc = node
-               if node != null then node.parent = self
-       end
        redef fun n_kwredef=(node)
        do
                _n_kwredef = node
                if node != null then node.parent = self
        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)
+       redef fun n_block=(node)
        do
-               _n_signature = node
-               node.parent = self
+               _n_block = node
+               if node != null then node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_doc)
                v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_visibility)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
+               v.enter_visit(_n_block)
        end
 end
-redef class ADeferredMethPropdef
-       init init_adeferredmethpropdef (
+redef class ATypePropdef
+       init init_atypepropdef (
                n_doc: nullable ADoc,
                n_kwredef: nullable TKwredef,
                n_visibility: nullable AVisibility,
-               n_kwmeth: nullable TKwmeth,
-               n_methid: nullable AMethid,
-               n_signature: nullable ASignature,
+               n_kwtype: nullable TKwtype,
+               n_id: nullable TClassid,
+               n_type: nullable AType,
                n_annotations: nullable AAnnotations
        )
        do
@@ -1050,12 +1018,12 @@ redef class ADeferredMethPropdef
                if n_kwredef != null then n_kwredef.parent = self
                _n_visibility = n_visibility.as(not null)
                n_visibility.parent = self
-               _n_kwmeth = n_kwmeth.as(not null)
-               n_kwmeth.parent = self
-               _n_methid = n_methid.as(not null)
-               n_methid.parent = self
-               _n_signature = n_signature.as(not null)
-               n_signature.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
@@ -1074,16 +1042,16 @@ redef class ADeferredMethPropdef
                        n_visibility = new_child.as(AVisibility)
                        return
                end
-               if _n_kwmeth == old_child then
-                       n_kwmeth = new_child.as(TKwmeth)
+               if _n_kwtype == old_child then
+                       n_kwtype = new_child.as(TKwtype)
                        return
                end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(AMethid)
+               if _n_id == old_child then
+                       n_id = new_child.as(TClassid)
                        return
                end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
+               if _n_type == old_child then
+                       n_type = new_child.as(AType)
                        return
                end
                if _n_annotations == old_child then
@@ -1107,19 +1075,19 @@ redef class ADeferredMethPropdef
                _n_visibility = node
                node.parent = self
        end
-       redef fun n_kwmeth=(node)
+       redef fun n_kwtype=(node)
        do
-               _n_kwmeth = node
+               _n_kwtype = node
                node.parent = self
        end
-       redef fun n_methid=(node)
+       redef fun n_id=(node)
        do
-               _n_methid = node
+               _n_id = node
                node.parent = self
        end
-       redef fun n_signature=(node)
+       redef fun n_type=(node)
        do
-               _n_signature = node
+               _n_type = node
                node.parent = self
        end
        redef fun n_annotations=(node)
@@ -1134,117 +1102,28 @@ redef class ADeferredMethPropdef
                v.enter_visit(_n_doc)
                v.enter_visit(_n_kwredef)
                v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwmeth)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
+               v.enter_visit(_n_kwtype)
+               v.enter_visit(_n_id)
+               v.enter_visit(_n_type)
                v.enter_visit(_n_annotations)
        end
 end
-redef class AInternMethPropdef
-       init init_ainternmethpropdef (
-               n_doc: nullable ADoc,
-               n_kwredef: nullable TKwredef,
-               n_visibility: nullable AVisibility,
-               n_kwmeth: nullable TKwmeth,
-               n_methid: nullable AMethid,
-               n_signature: nullable ASignature
-       )
-       do
-               _n_doc = n_doc
-               if n_doc != null then n_doc.parent = self
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _n_visibility = n_visibility.as(not null)
-               n_visibility.parent = self
-               _n_kwmeth = n_kwmeth.as(not null)
-               n_kwmeth.parent = self
-               _n_methid = n_methid.as(not null)
-               n_methid.parent = self
-               _n_signature = n_signature.as(not null)
-               n_signature.parent = self
-       end
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_doc == old_child then
-                       n_doc = new_child.as(nullable ADoc)
-                       return
-               end
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_visibility == old_child then
-                       n_visibility = new_child.as(AVisibility)
-                       return
-               end
-               if _n_kwmeth == old_child then
-                       n_kwmeth = new_child.as(TKwmeth)
-                       return
-               end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(AMethid)
-                       return
-               end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
-                       return
-               end
-       end
-
-       redef fun n_doc=(node)
-       do
-               _n_doc = node
-               if node != null then node.parent = self
-       end
-       redef fun n_kwredef=(node)
-       do
-               _n_kwredef = node
-               if node != null then node.parent = self
-       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
-               v.enter_visit(_n_doc)
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwmeth)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
-       end
-end
-redef class AExternMethPropdef
-       init init_aexternmethpropdef (
+redef class AMethPropdef
+       init init_amethpropdef (
                n_doc: nullable ADoc,
                n_kwredef: nullable TKwredef,
                n_visibility: nullable AVisibility,
                n_kwmeth: nullable TKwmeth,
+               n_kwinit: nullable TKwinit,
+               n_kwnew: nullable TKwnew,
                n_methid: nullable AMethid,
                n_signature: nullable ASignature,
-               n_extern: nullable TString,
+               n_annotations: nullable AAnnotations,
                n_extern_calls: nullable AExternCalls,
-               n_extern_code_block: nullable AExternCodeBlock
+               n_extern_code_block: nullable AExternCodeBlock,
+               n_kwdo: nullable TKwdo,
+               n_block: nullable AExpr,
+               n_kwend: nullable TKwend
        )
        do
                _n_doc = n_doc
@@ -1253,18 +1132,28 @@ redef class AExternMethPropdef
                if n_kwredef != null then n_kwredef.parent = self
                _n_visibility = n_visibility.as(not null)
                n_visibility.parent = self
-               _n_kwmeth = n_kwmeth.as(not null)
-               n_kwmeth.parent = self
-               _n_methid = n_methid.as(not null)
-               n_methid.parent = self
+               _n_kwmeth = n_kwmeth
+               if n_kwmeth != null then n_kwmeth.parent = self
+               _n_kwinit = n_kwinit
+               if n_kwinit != null then n_kwinit.parent = self
+               _n_kwnew = n_kwnew
+               if n_kwnew != null then n_kwnew.parent = self
+               _n_methid = n_methid
+               if n_methid != null then n_methid.parent = self
                _n_signature = n_signature.as(not null)
                n_signature.parent = self
-               _n_extern = n_extern
-               if n_extern != null then n_extern.parent = self
+               _n_annotations = n_annotations
+               if n_annotations != null then n_annotations.parent = self
                _n_extern_calls = n_extern_calls
                if n_extern_calls != null then n_extern_calls.parent = self
                _n_extern_code_block = n_extern_code_block
                if n_extern_code_block != null then n_extern_code_block.parent = self
+               _n_kwdo = n_kwdo
+               if n_kwdo != null then n_kwdo.parent = self
+               _n_block = n_block
+               if n_block != null then n_block.parent = self
+               _n_kwend = n_kwend
+               if n_kwend != null then n_kwend.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1282,19 +1171,27 @@ redef class AExternMethPropdef
                        return
                end
                if _n_kwmeth == old_child then
-                       n_kwmeth = new_child.as(TKwmeth)
+                       n_kwmeth = new_child.as(nullable TKwmeth)
+                       return
+               end
+               if _n_kwinit == old_child then
+                       n_kwinit = new_child.as(nullable TKwinit)
+                       return
+               end
+               if _n_kwnew == old_child then
+                       n_kwnew = new_child.as(nullable TKwnew)
                        return
                end
                if _n_methid == old_child then
-                       n_methid = new_child.as(AMethid)
+                       n_methid = new_child.as(nullable AMethid)
                        return
                end
                if _n_signature == old_child then
                        n_signature = new_child.as(ASignature)
                        return
                end
-               if _n_extern == old_child then
-                       n_extern = new_child.as(nullable TString)
+               if _n_annotations == old_child then
+                       n_annotations = new_child.as(nullable AAnnotations)
                        return
                end
                if _n_extern_calls == old_child then
@@ -1305,6 +1202,18 @@ redef class AExternMethPropdef
                        n_extern_code_block = new_child.as(nullable AExternCodeBlock)
                        return
                end
+               if _n_kwdo == old_child then
+                       n_kwdo = new_child.as(nullable TKwdo)
+                       return
+               end
+               if _n_block == old_child then
+                       n_block = new_child.as(nullable AExpr)
+                       return
+               end
+               if _n_kwend == old_child then
+                       n_kwend = new_child.as(nullable TKwend)
+                       return
+               end
        end
 
        redef fun n_doc=(node)
@@ -1325,21 +1234,31 @@ redef class AExternMethPropdef
        redef fun n_kwmeth=(node)
        do
                _n_kwmeth = node
-               node.parent = self
+               if node != null then node.parent = self
+       end
+       redef fun n_kwinit=(node)
+       do
+               _n_kwinit = node
+               if node != null then node.parent = self
+       end
+       redef fun n_kwnew=(node)
+       do
+               _n_kwnew = node
+               if node != null then node.parent = self
        end
        redef fun n_methid=(node)
        do
                _n_methid = node
-               node.parent = self
+               if node != null then node.parent = self
        end
        redef fun n_signature=(node)
        do
                _n_signature = node
                node.parent = self
        end
-       redef fun n_extern=(node)
+       redef fun n_annotations=(node)
        do
-               _n_extern = node
+               _n_annotations = node
                if node != null then node.parent = self
        end
        redef fun n_extern_calls=(node)
@@ -1352,6 +1271,21 @@ redef class AExternMethPropdef
                _n_extern_code_block = node
                if node != null then node.parent = self
        end
+       redef fun n_kwdo=(node)
+       do
+               _n_kwdo = node
+               if node != null then node.parent = self
+       end
+       redef fun n_block=(node)
+       do
+               _n_block = node
+               if node != null then node.parent = self
+       end
+       redef fun n_kwend=(node)
+       do
+               _n_kwend = node
+               if node != null then node.parent = self
+       end
 
 
        redef fun visit_all(v: Visitor)
@@ -1360,23 +1294,26 @@ redef class AExternMethPropdef
                v.enter_visit(_n_kwredef)
                v.enter_visit(_n_visibility)
                v.enter_visit(_n_kwmeth)
+               v.enter_visit(_n_kwinit)
+               v.enter_visit(_n_kwnew)
                v.enter_visit(_n_methid)
                v.enter_visit(_n_signature)
-               v.enter_visit(_n_extern)
+               v.enter_visit(_n_annotations)
                v.enter_visit(_n_extern_calls)
                v.enter_visit(_n_extern_code_block)
+               v.enter_visit(_n_kwdo)
+               v.enter_visit(_n_block)
+               v.enter_visit(_n_kwend)
        end
 end
-redef class AConcreteMethPropdef
-       init init_aconcretemethpropdef (
+redef class ASuperPropdef
+       init init_asuperpropdef (
                n_doc: nullable ADoc,
                n_kwredef: nullable TKwredef,
                n_visibility: nullable AVisibility,
-               n_kwmeth: nullable TKwmeth,
-               n_methid: nullable AMethid,
-               n_signature: nullable ASignature,
-               n_annotations: nullable AAnnotations,
-               n_block: nullable AExpr
+               n_kwsuper: nullable TKwsuper,
+               n_type: nullable AType,
+               n_annotations: nullable AAnnotations
        )
        do
                _n_doc = n_doc
@@ -1385,16 +1322,12 @@ redef class AConcreteMethPropdef
                if n_kwredef != null then n_kwredef.parent = self
                _n_visibility = n_visibility.as(not null)
                n_visibility.parent = self
-               _n_kwmeth = n_kwmeth.as(not null)
-               n_kwmeth.parent = self
-               _n_methid = n_methid.as(not null)
-               n_methid.parent = self
-               _n_signature = n_signature.as(not null)
-               n_signature.parent = self
+               _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
-               _n_block = n_block
-               if n_block != null then n_block.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1411,26 +1344,18 @@ redef class AConcreteMethPropdef
                        n_visibility = new_child.as(AVisibility)
                        return
                end
-               if _n_kwmeth == old_child then
-                       n_kwmeth = new_child.as(TKwmeth)
-                       return
-               end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(AMethid)
+               if _n_kwsuper == old_child then
+                       n_kwsuper = new_child.as(TKwsuper)
                        return
                end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
+               if _n_type == old_child then
+                       n_type = new_child.as(AType)
                        return
                end
                if _n_annotations == old_child then
                        n_annotations = new_child.as(nullable AAnnotations)
                        return
                end
-               if _n_block == old_child then
-                       n_block = new_child.as(nullable AExpr)
-                       return
-               end
        end
 
        redef fun n_doc=(node)
@@ -1448,31 +1373,21 @@ redef class AConcreteMethPropdef
                _n_visibility = node
                node.parent = self
        end
-       redef fun n_kwmeth=(node)
+       redef fun n_kwsuper=(node)
        do
-               _n_kwmeth = node
+               _n_kwsuper = node
                node.parent = self
        end
-       redef fun n_methid=(node)
+       redef fun n_type=(node)
        do
-               _n_methid = node
+               _n_type = node
                node.parent = self
        end
-       redef fun n_signature=(node)
-       do
-               _n_signature = node
-               node.parent = self
-       end
-       redef fun n_annotations=(node)
+       redef fun n_annotations=(node)
        do
                _n_annotations = node
                if node != null then node.parent = self
        end
-       redef fun n_block=(node)
-       do
-               _n_block = node
-               if node != null then node.parent = self
-       end
 
 
        redef fun visit_all(v: Visitor)
@@ -1480,41 +1395,38 @@ redef class AConcreteMethPropdef
                v.enter_visit(_n_doc)
                v.enter_visit(_n_kwredef)
                v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwmeth)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
+               v.enter_visit(_n_kwsuper)
+               v.enter_visit(_n_type)
                v.enter_visit(_n_annotations)
-               v.enter_visit(_n_block)
        end
 end
-redef class AConcreteInitPropdef
-       init init_aconcreteinitpropdef (
+redef class AAnnotPropdef
+       init init_aannotpropdef (
                n_doc: nullable ADoc,
                n_kwredef: nullable TKwredef,
                n_visibility: nullable AVisibility,
-               n_kwinit: nullable TKwinit,
-               n_methid: nullable AMethid,
-               n_signature: nullable ASignature,
-               n_annotations: nullable AAnnotations,
-               n_block: nullable AExpr
+               n_atid: nullable AAtid,
+               n_opar: nullable TOpar,
+               n_args: Collection[Object], # Should be Collection[AExpr]
+               n_cpar: nullable TCpar,
+               n_annotations: nullable AAnnotations
        )
        do
                _n_doc = n_doc
                if n_doc != null then n_doc.parent = self
                _n_kwredef = n_kwredef
                if n_kwredef != null then n_kwredef.parent = self
-               _n_visibility = n_visibility.as(not null)
-               n_visibility.parent = self
-               _n_kwinit = n_kwinit.as(not null)
-               n_kwinit.parent = self
-               _n_methid = n_methid
-               if n_methid != null then n_methid.parent = self
-               _n_signature = n_signature.as(not null)
-               n_signature.parent = self
+               _n_visibility = n_visibility
+               if n_visibility != null then n_visibility.parent = self
+               _n_atid = n_atid.as(not null)
+               n_atid.parent = self
+               _n_opar = n_opar
+               if n_opar != null then n_opar.parent = self
+               self.n_args.unsafe_add_all(n_args)
+               _n_cpar = n_cpar
+               if n_cpar != null then n_cpar.parent = self
                _n_annotations = n_annotations
                if n_annotations != null then n_annotations.parent = self
-               _n_block = n_block
-               if n_block != null then n_block.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -1528,29 +1440,26 @@ redef class AConcreteInitPropdef
                        return
                end
                if _n_visibility == old_child then
-                       n_visibility = new_child.as(AVisibility)
+                       n_visibility = new_child.as(nullable AVisibility)
                        return
                end
-               if _n_kwinit == old_child then
-                       n_kwinit = new_child.as(TKwinit)
+               if _n_atid == old_child then
+                       n_atid = new_child.as(AAtid)
                        return
                end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(nullable AMethid)
+               if _n_opar == old_child then
+                       n_opar = new_child.as(nullable TOpar)
                        return
                end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
+               if n_args.replace_child(old_child, new_child) then return
+               if _n_cpar == old_child then
+                       n_cpar = new_child.as(nullable TCpar)
                        return
                end
                if _n_annotations == old_child then
                        n_annotations = new_child.as(nullable AAnnotations)
                        return
                end
-               if _n_block == old_child then
-                       n_block = new_child.as(nullable AExpr)
-                       return
-               end
        end
 
        redef fun n_doc=(node)
@@ -1566,33 +1475,28 @@ redef class AConcreteInitPropdef
        redef fun n_visibility=(node)
        do
                _n_visibility = node
-               node.parent = self
+               if node != null then node.parent = self
        end
-       redef fun n_kwinit=(node)
+       redef fun n_atid=(node)
        do
-               _n_kwinit = node
+               _n_atid = node
                node.parent = self
        end
-       redef fun n_methid=(node)
+       redef fun n_opar=(node)
        do
-               _n_methid = node
+               _n_opar = node
                if node != null then node.parent = self
        end
-       redef fun n_signature=(node)
+       redef fun n_cpar=(node)
        do
-               _n_signature = node
-               node.parent = self
+               _n_cpar = node
+               if node != null then node.parent = self
        end
        redef fun n_annotations=(node)
        do
                _n_annotations = node
                if node != null then node.parent = self
        end
-       redef fun n_block=(node)
-       do
-               _n_block = node
-               if node != null then node.parent = self
-       end
 
 
        redef fun visit_all(v: Visitor)
@@ -1600,796 +1504,591 @@ redef class AConcreteInitPropdef
                v.enter_visit(_n_doc)
                v.enter_visit(_n_kwredef)
                v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwinit)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
+               v.enter_visit(_n_atid)
+               v.enter_visit(_n_opar)
+               n_args.visit_all(v)
+               v.enter_visit(_n_cpar)
                v.enter_visit(_n_annotations)
-               v.enter_visit(_n_block)
        end
 end
-redef class AExternInitPropdef
-       init init_aexterninitpropdef (
-               n_doc: nullable ADoc,
-               n_kwredef: nullable TKwredef,
-               n_visibility: nullable AVisibility,
-               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
+redef class AIdMethid
+       init init_aidmethid (
+               n_id: nullable TId
        )
        do
-               _n_doc = n_doc
-               if n_doc != null then n_doc.parent = self
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _n_visibility = n_visibility.as(not null)
-               n_visibility.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
-               _n_signature = n_signature.as(not null)
-               n_signature.parent = self
-               _n_extern = n_extern
-               if n_extern != null then n_extern.parent = self
-               _n_extern_calls = n_extern_calls
-               if n_extern_calls != null then n_extern_calls.parent = self
-               _n_extern_code_block = n_extern_code_block
-               if n_extern_code_block != null then n_extern_code_block.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_doc == old_child then
-                       n_doc = new_child.as(nullable ADoc)
-                       return
-               end
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_visibility == old_child then
-                       n_visibility = new_child.as(AVisibility)
-                       return
-               end
-               if _n_kwnew == old_child then
-                       n_kwnew = new_child.as(TKwnew)
-                       return
-               end
-               if _n_methid == old_child then
-                       n_methid = new_child.as(nullable AMethid)
-                       return
-               end
-               if _n_signature == old_child then
-                       n_signature = new_child.as(ASignature)
-                       return
-               end
-               if _n_extern == old_child then
-                       n_extern = new_child.as(nullable TString)
-                       return
-               end
-               if _n_extern_calls == old_child then
-                       n_extern_calls = new_child.as(nullable AExternCalls)
-                       return
-               end
-               if _n_extern_code_block == old_child then
-                       n_extern_code_block = new_child.as(nullable AExternCodeBlock)
+               if _n_id == old_child then
+                       n_id = new_child.as(TId)
                        return
                end
        end
 
-       redef fun n_doc=(node)
+       redef fun n_id=(node)
        do
-               _n_doc = node
-               if node != null then node.parent = self
+               _n_id = node
+               node.parent = self
        end
-       redef fun n_kwredef=(node)
+
+
+       redef fun visit_all(v: Visitor)
        do
-               _n_kwredef = node
-               if node != null then node.parent = self
+               v.enter_visit(_n_id)
        end
-       redef fun n_visibility=(node)
+end
+redef class APlusMethid
+       init init_aplusmethid (
+               n_op: nullable TPlus
+       )
        do
-               _n_visibility = node
-               node.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
-       redef fun n_kwnew=(node)
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               _n_kwnew = node
-               node.parent = self
+               if _n_op == old_child then
+                       n_op = new_child.as(TPlus)
+                       return
+               end
        end
-       redef fun n_methid=(node)
+
+       redef fun n_op=(node)
        do
-               _n_methid = node
-               if node != null then node.parent = self
+               _n_op = node
+               node.parent = self
        end
-       redef fun n_signature=(node)
+
+
+       redef fun visit_all(v: Visitor)
        do
-               _n_signature = node
-               node.parent = self
+               v.enter_visit(_n_op)
        end
-       redef fun n_extern=(node)
+end
+redef class AMinusMethid
+       init init_aminusmethid (
+               n_op: nullable TMinus
+       )
        do
-               _n_extern = node
-               if node != null then node.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
-       redef fun n_extern_calls=(node)
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               _n_extern_calls = node
-               if node != null then node.parent = self
+               if _n_op == old_child then
+                       n_op = new_child.as(TMinus)
+                       return
+               end
        end
-       redef fun n_extern_code_block=(node)
+
+       redef fun n_op=(node)
        do
-               _n_extern_code_block = node
-               if node != null then node.parent = self
+               _n_op = node
+               node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_doc)
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwnew)
-               v.enter_visit(_n_methid)
-               v.enter_visit(_n_signature)
-               v.enter_visit(_n_extern)
-               v.enter_visit(_n_extern_calls)
-               v.enter_visit(_n_extern_code_block)
+               v.enter_visit(_n_op)
        end
 end
-redef class AMainMethPropdef
-       init init_amainmethpropdef (
-               n_kwredef: nullable TKwredef,
-               n_block: nullable AExpr
+redef class AStarMethid
+       init init_astarmethid (
+               n_op: nullable TStar
        )
        do
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _n_block = n_block
-               if n_block != null then n_block.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_block == old_child then
-                       n_block = new_child.as(nullable AExpr)
+               if _n_op == old_child then
+                       n_op = new_child.as(TStar)
                        return
                end
        end
 
-       redef fun n_kwredef=(node)
-       do
-               _n_kwredef = node
-               if node != null then node.parent = self
-       end
-       redef fun n_block=(node)
+       redef fun n_op=(node)
        do
-               _n_block = node
-               if node != null then node.parent = self
+               _n_op = node
+               node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_block)
+               v.enter_visit(_n_op)
        end
 end
-redef class ATypePropdef
-       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
+redef class AStarstarMethid
+       init init_astarstarmethid (
+               n_op: nullable TStarstar
        )
        do
-               _n_doc = n_doc
-               if n_doc != null then n_doc.parent = self
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _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
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_doc == old_child then
-                       n_doc = new_child.as(nullable ADoc)
-                       return
-               end
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_visibility == old_child then
-                       n_visibility = new_child.as(AVisibility)
-                       return
-               end
-               if _n_kwtype == old_child then
-                       n_kwtype = new_child.as(TKwtype)
-                       return
-               end
-               if _n_id == old_child then
-                       n_id = new_child.as(TClassid)
-                       return
-               end
-               if _n_type == old_child then
-                       n_type = new_child.as(AType)
-                       return
-               end
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
-                       return
-               end
-       end
-
-       redef fun n_doc=(node)
-       do
-               _n_doc = node
-               if node != null then node.parent = self
-       end
-       redef fun n_kwredef=(node)
-       do
-               _n_kwredef = node
-               if node != null then node.parent = self
-       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
-
-
-       redef fun visit_all(v: Visitor)
-       do
-               v.enter_visit(_n_doc)
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwtype)
-               v.enter_visit(_n_id)
-               v.enter_visit(_n_type)
-               v.enter_visit(_n_annotations)
-       end
-end
-redef class AReadAble
-       init init_areadable (
-               n_kwredef: nullable TKwredef,
-               n_kwreadable: nullable TKwreadable
-       )
-       do
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _n_kwreadable = n_kwreadable.as(not null)
-               n_kwreadable.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_kwreadable == old_child then
-                       n_kwreadable = new_child.as(TKwreadable)
+               if _n_op == old_child then
+                       n_op = new_child.as(TStarstar)
                        return
                end
        end
 
-       redef fun n_kwredef=(node)
-       do
-               _n_kwredef = node
-               if node != null then node.parent = self
-       end
-       redef fun n_kwreadable=(node)
+       redef fun n_op=(node)
        do
-               _n_kwreadable = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_kwreadable)
+               v.enter_visit(_n_op)
        end
 end
-redef class AWriteAble
-       init init_awriteable (
-               n_kwredef: nullable TKwredef,
-               n_visibility: nullable AVisibility,
-               n_kwwritable: nullable TKwwritable
+redef class ASlashMethid
+       init init_aslashmethid (
+               n_op: nullable TSlash
        )
        do
-               _n_kwredef = n_kwredef
-               if n_kwredef != null then n_kwredef.parent = self
-               _n_visibility = n_visibility
-               if n_visibility != null then n_visibility.parent = self
-               _n_kwwritable = n_kwwritable.as(not null)
-               n_kwwritable.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_kwredef == old_child then
-                       n_kwredef = new_child.as(nullable TKwredef)
-                       return
-               end
-               if _n_visibility == old_child then
-                       n_visibility = new_child.as(nullable AVisibility)
-                       return
-               end
-               if _n_kwwritable == old_child then
-                       n_kwwritable = new_child.as(TKwwritable)
+               if _n_op == old_child then
+                       n_op = new_child.as(TSlash)
                        return
                end
        end
 
-       redef fun n_kwredef=(node)
-       do
-               _n_kwredef = node
-               if node != null then node.parent = self
-       end
-       redef fun n_visibility=(node)
-       do
-               _n_visibility = node
-               if node != null then node.parent = self
-       end
-       redef fun n_kwwritable=(node)
+       redef fun n_op=(node)
        do
-               _n_kwwritable = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_kwredef)
-               v.enter_visit(_n_visibility)
-               v.enter_visit(_n_kwwritable)
+               v.enter_visit(_n_op)
        end
 end
-redef class AIdMethid
-       init init_aidmethid (
-               n_id: nullable TId
+redef class APercentMethid
+       init init_apercentmethid (
+               n_op: nullable TPercent
        )
        do
-               _n_id = n_id.as(not null)
-               n_id.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_id == old_child then
-                       n_id = new_child.as(TId)
+               if _n_op == old_child then
+                       n_op = new_child.as(TPercent)
                        return
                end
        end
 
-       redef fun n_id=(node)
+       redef fun n_op=(node)
        do
-               _n_id = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_id)
+               v.enter_visit(_n_op)
        end
 end
-redef class APlusMethid
-       init init_aplusmethid (
-               n_plus: nullable TPlus
+redef class AEqMethid
+       init init_aeqmethid (
+               n_op: nullable TEq
        )
        do
-               _n_plus = n_plus.as(not null)
-               n_plus.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_plus == old_child then
-                       n_plus = new_child.as(TPlus)
+               if _n_op == old_child then
+                       n_op = new_child.as(TEq)
                        return
                end
        end
 
-       redef fun n_plus=(node)
+       redef fun n_op=(node)
        do
-               _n_plus = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_plus)
+               v.enter_visit(_n_op)
        end
 end
-redef class AMinusMethid
-       init init_aminusmethid (
-               n_minus: nullable TMinus
+redef class ANeMethid
+       init init_anemethid (
+               n_op: nullable TNe
        )
        do
-               _n_minus = n_minus.as(not null)
-               n_minus.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_minus == old_child then
-                       n_minus = new_child.as(TMinus)
+               if _n_op == old_child then
+                       n_op = new_child.as(TNe)
                        return
                end
        end
 
-       redef fun n_minus=(node)
+       redef fun n_op=(node)
        do
-               _n_minus = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_minus)
+               v.enter_visit(_n_op)
        end
 end
-redef class AStarMethid
-       init init_astarmethid (
-               n_star: nullable TStar
+redef class ALeMethid
+       init init_alemethid (
+               n_op: nullable TLe
        )
        do
-               _n_star = n_star.as(not null)
-               n_star.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_star == old_child then
-                       n_star = new_child.as(TStar)
+               if _n_op == old_child then
+                       n_op = new_child.as(TLe)
                        return
                end
        end
 
-       redef fun n_star=(node)
+       redef fun n_op=(node)
        do
-               _n_star = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_star)
+               v.enter_visit(_n_op)
        end
 end
-redef class ASlashMethid
-       init init_aslashmethid (
-               n_slash: nullable TSlash
+redef class AGeMethid
+       init init_agemethid (
+               n_op: nullable TGe
        )
        do
-               _n_slash = n_slash.as(not null)
-               n_slash.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_slash == old_child then
-                       n_slash = new_child.as(TSlash)
+               if _n_op == old_child then
+                       n_op = new_child.as(TGe)
                        return
                end
        end
 
-       redef fun n_slash=(node)
+       redef fun n_op=(node)
        do
-               _n_slash = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_slash)
+               v.enter_visit(_n_op)
        end
 end
-redef class APercentMethid
-       init init_apercentmethid (
-               n_percent: nullable TPercent
+redef class ALtMethid
+       init init_altmethid (
+               n_op: nullable TLt
        )
        do
-               _n_percent = n_percent.as(not null)
-               n_percent.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_percent == old_child then
-                       n_percent = new_child.as(TPercent)
+               if _n_op == old_child then
+                       n_op = new_child.as(TLt)
                        return
                end
        end
 
-       redef fun n_percent=(node)
+       redef fun n_op=(node)
        do
-               _n_percent = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_percent)
+               v.enter_visit(_n_op)
        end
 end
-redef class AEqMethid
-       init init_aeqmethid (
-               n_eq: nullable TEq
+redef class AGtMethid
+       init init_agtmethid (
+               n_op: nullable TGt
        )
        do
-               _n_eq = n_eq.as(not null)
-               n_eq.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_eq == old_child then
-                       n_eq = new_child.as(TEq)
+               if _n_op == old_child then
+                       n_op = new_child.as(TGt)
                        return
                end
        end
 
-       redef fun n_eq=(node)
+       redef fun n_op=(node)
        do
-               _n_eq = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_eq)
+               v.enter_visit(_n_op)
        end
 end
-redef class ANeMethid
-       init init_anemethid (
-               n_ne: nullable TNe
+redef class ALlMethid
+       init init_allmethid (
+               n_op: nullable TLl
        )
        do
-               _n_ne = n_ne.as(not null)
-               n_ne.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_ne == old_child then
-                       n_ne = new_child.as(TNe)
+               if _n_op == old_child then
+                       n_op = new_child.as(TLl)
                        return
                end
        end
 
-       redef fun n_ne=(node)
+       redef fun n_op=(node)
        do
-               _n_ne = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_ne)
+               v.enter_visit(_n_op)
        end
 end
-redef class ALeMethid
-       init init_alemethid (
-               n_le: nullable TLe
+redef class AGgMethid
+       init init_aggmethid (
+               n_op: nullable TGg
        )
        do
-               _n_le = n_le.as(not null)
-               n_le.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_le == old_child then
-                       n_le = new_child.as(TLe)
+               if _n_op == old_child then
+                       n_op = new_child.as(TGg)
                        return
                end
        end
 
-       redef fun n_le=(node)
+       redef fun n_op=(node)
        do
-               _n_le = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_le)
+               v.enter_visit(_n_op)
        end
 end
-redef class AGeMethid
-       init init_agemethid (
-               n_ge: nullable TGe
+redef class AStarshipMethid
+       init init_astarshipmethid (
+               n_op: nullable TStarship
        )
        do
-               _n_ge = n_ge.as(not null)
-               n_ge.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_ge == old_child then
-                       n_ge = new_child.as(TGe)
+               if _n_op == old_child then
+                       n_op = new_child.as(TStarship)
                        return
                end
        end
 
-       redef fun n_ge=(node)
+       redef fun n_op=(node)
        do
-               _n_ge = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_ge)
+               v.enter_visit(_n_op)
        end
 end
-redef class ALtMethid
-       init init_altmethid (
-               n_lt: nullable TLt
+redef class APipeMethid
+       init init_apipemethid (
+               n_op: nullable TPipe
        )
        do
-               _n_lt = n_lt.as(not null)
-               n_lt.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_lt == old_child then
-                       n_lt = new_child.as(TLt)
+               if _n_op == old_child then
+                       n_op = new_child.as(TPipe)
                        return
                end
        end
 
-       redef fun n_lt=(node)
+       redef fun n_op=(node)
        do
-               _n_lt = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_lt)
+               v.enter_visit(_n_op)
        end
 end
-redef class AGtMethid
-       init init_agtmethid (
-               n_gt: nullable TGt
+redef class ACaretMethid
+       init init_acaretmethid (
+               n_op: nullable TCaret
        )
        do
-               _n_gt = n_gt.as(not null)
-               n_gt.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_gt == old_child then
-                       n_gt = new_child.as(TGt)
+               if _n_op == old_child then
+                       n_op = new_child.as(TCaret)
                        return
                end
        end
 
-       redef fun n_gt=(node)
+       redef fun n_op=(node)
        do
-               _n_gt = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_gt)
+               v.enter_visit(_n_op)
        end
 end
-redef class ALlMethid
-       init init_allmethid (
-               n_ll: nullable TLl
+redef class AAmpMethid
+       init init_aampmethid (
+               n_op: nullable TAmp
        )
        do
-               _n_ll = n_ll.as(not null)
-               n_ll.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_ll == old_child then
-                       n_ll = new_child.as(TLl)
+               if _n_op == old_child then
+                       n_op = new_child.as(TAmp)
                        return
                end
        end
 
-       redef fun n_ll=(node)
+       redef fun n_op=(node)
        do
-               _n_ll = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_ll)
+               v.enter_visit(_n_op)
        end
 end
-redef class AGgMethid
-       init init_aggmethid (
-               n_gg: nullable TGg
+redef class ATildeMethid
+       init init_atildemethid (
+               n_op: nullable TTilde
        )
        do
-               _n_gg = n_gg.as(not null)
-               n_gg.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_gg == old_child then
-                       n_gg = new_child.as(TGg)
+               if _n_op == old_child then
+                       n_op = new_child.as(TTilde)
                        return
                end
        end
 
-       redef fun n_gg=(node)
+       redef fun n_op=(node)
        do
-               _n_gg = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_gg)
+               v.enter_visit(_n_op)
        end
 end
 redef class ABraMethid
@@ -2434,35 +2133,6 @@ redef class ABraMethid
                v.enter_visit(_n_cbra)
        end
 end
-redef class AStarshipMethid
-       init init_astarshipmethid (
-               n_starship: nullable TStarship
-       )
-       do
-               _n_starship = n_starship.as(not null)
-               n_starship.parent = self
-       end
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_starship == old_child then
-                       n_starship = new_child.as(TStarship)
-                       return
-               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)
-       end
-end
 redef class AAssignMethid
        init init_aassignmethid (
                n_id: nullable TId,
@@ -2560,6 +2230,48 @@ redef class ABraassignMethid
                v.enter_visit(_n_assign)
        end
 end
+redef class AQid
+       init init_aqid (
+               n_qualified: nullable AQualified,
+               n_id: nullable TId
+       )
+       do
+               _n_qualified = n_qualified
+               if n_qualified != null then n_qualified.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_qualified == old_child then
+                       n_qualified = new_child.as(nullable AQualified)
+                       return
+               end
+               if _n_id == old_child then
+                       n_id = new_child.as(TId)
+                       return
+               end
+       end
+
+       redef fun n_qualified=(node)
+       do
+               _n_qualified = node
+               if node != null then 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_qualified)
+               v.enter_visit(_n_id)
+       end
+end
 redef class ASignature
        init init_asignature (
                n_opar: nullable TOpar,
@@ -2570,7 +2282,7 @@ redef class ASignature
        do
                _n_opar = n_opar
                if n_opar != null then n_opar.parent = self
-               _n_params.unsafe_add_all(n_params)
+               self.n_params.unsafe_add_all(n_params)
                _n_cpar = n_cpar
                if n_cpar != null then n_cpar.parent = self
                _n_type = n_type
@@ -2583,7 +2295,7 @@ redef class ASignature
                        n_opar = new_child.as(nullable TOpar)
                        return
                end
-               if _n_params.replace_child(old_child, new_child) then return
+               if n_params.replace_child(old_child, new_child) then return
                if _n_cpar == old_child then
                        n_cpar = new_child.as(nullable TCpar)
                        return
@@ -2614,7 +2326,7 @@ redef class ASignature
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_opar)
-               _n_params.visit_all(v)
+               n_params.visit_all(v)
                v.enter_visit(_n_cpar)
                v.enter_visit(_n_type)
        end
@@ -2691,7 +2403,9 @@ redef class AType
        init init_atype (
                n_kwnullable: nullable TKwnullable,
                n_id: nullable TClassid,
+               n_obra: nullable TObra,
                n_types: Collection[Object], # Should be Collection[AType]
+               n_cbra: nullable TCbra,
                n_annotations: nullable AAnnotations
        )
        do
@@ -2699,7 +2413,11 @@ redef class AType
                if n_kwnullable != null then n_kwnullable.parent = self
                _n_id = n_id.as(not null)
                n_id.parent = self
-               _n_types.unsafe_add_all(n_types)
+               _n_obra = n_obra
+               if n_obra != null then n_obra.parent = self
+               self.n_types.unsafe_add_all(n_types)
+               _n_cbra = n_cbra
+               if n_cbra != null then n_cbra.parent = self
                _n_annotations = n_annotations
                if n_annotations != null then n_annotations.parent = self
        end
@@ -2714,12 +2432,20 @@ redef class AType
                        n_id = new_child.as(TClassid)
                        return
                end
-               if _n_types.replace_child(old_child, new_child) then return
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
+               if _n_obra == old_child then
+                       n_obra = new_child.as(nullable TObra)
                        return
                end
-       end
+               if n_types.replace_child(old_child, new_child) then return
+               if _n_cbra == old_child then
+                       n_cbra = new_child.as(nullable TCbra)
+                       return
+               end
+               if _n_annotations == old_child then
+                       n_annotations = new_child.as(nullable AAnnotations)
+                       return
+               end
+       end
 
        redef fun n_kwnullable=(node)
        do
@@ -2731,6 +2457,16 @@ redef class AType
                _n_id = node
                node.parent = self
        end
+       redef fun n_obra=(node)
+       do
+               _n_obra = node
+               if node != null then node.parent = self
+       end
+       redef fun n_cbra=(node)
+       do
+               _n_cbra = node
+               if node != null then node.parent = self
+       end
        redef fun n_annotations=(node)
        do
                _n_annotations = node
@@ -2742,7 +2478,9 @@ redef class AType
        do
                v.enter_visit(_n_kwnullable)
                v.enter_visit(_n_id)
-               _n_types.visit_all(v)
+               v.enter_visit(_n_obra)
+               n_types.visit_all(v)
+               v.enter_visit(_n_cbra)
                v.enter_visit(_n_annotations)
        end
 end
@@ -2754,8 +2492,8 @@ redef class ALabel
        do
                _n_kwlabel = n_kwlabel.as(not null)
                n_kwlabel.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
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -2765,7 +2503,7 @@ redef class ALabel
                        return
                end
                if _n_id == old_child then
-                       n_id = new_child.as(TId)
+                       n_id = new_child.as(nullable TId)
                        return
                end
        end
@@ -2778,7 +2516,7 @@ redef class ALabel
        redef fun n_id=(node)
        do
                _n_id = node
-               node.parent = self
+               if node != null then node.parent = self
        end
 
 
@@ -2794,14 +2532,14 @@ redef class ABlockExpr
                n_kwend: nullable TKwend
        )
        do
-               _n_expr.unsafe_add_all(n_expr)
+               self.n_expr.unsafe_add_all(n_expr)
                _n_kwend = n_kwend
                if n_kwend != null then n_kwend.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_expr.replace_child(old_child, new_child) then return
+               if n_expr.replace_child(old_child, new_child) then return
                if _n_kwend == old_child then
                        n_kwend = new_child.as(nullable TKwend)
                        return
@@ -2817,7 +2555,7 @@ redef class ABlockExpr
 
        redef fun visit_all(v: Visitor)
        do
-               _n_expr.visit_all(v)
+               n_expr.visit_all(v)
                v.enter_visit(_n_kwend)
        end
 end
@@ -2831,8 +2569,8 @@ redef class AVardeclExpr
                n_annotations: nullable AAnnotations
        )
        do
-               _n_kwvar = n_kwvar.as(not null)
-               n_kwvar.parent = self
+               _n_kwvar = n_kwvar
+               if n_kwvar != null then n_kwvar.parent = self
                _n_id = n_id.as(not null)
                n_id.parent = self
                _n_type = n_type
@@ -2848,7 +2586,7 @@ redef class AVardeclExpr
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
                if _n_kwvar == old_child then
-                       n_kwvar = new_child.as(TKwvar)
+                       n_kwvar = new_child.as(nullable TKwvar)
                        return
                end
                if _n_id == old_child then
@@ -2876,7 +2614,7 @@ redef class AVardeclExpr
        redef fun n_kwvar=(node)
        do
                _n_kwvar = node
-               node.parent = self
+               if node != null then node.parent = self
        end
        redef fun n_id=(node)
        do
@@ -2960,16 +2698,13 @@ end
 redef class ABreakExpr
        init init_abreakexpr (
                n_kwbreak: nullable TKwbreak,
-               n_label: nullable ALabel,
-               n_expr: nullable AExpr
+               n_label: nullable ALabel
        )
        do
                _n_kwbreak = n_kwbreak.as(not null)
                n_kwbreak.parent = self
                _n_label = n_label
                if n_label != null then n_label.parent = self
-               _n_expr = n_expr
-               if n_expr != null then n_expr.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -2982,10 +2717,6 @@ redef class ABreakExpr
                        n_label = new_child.as(nullable ALabel)
                        return
                end
-               if _n_expr == old_child then
-                       n_expr = new_child.as(nullable AExpr)
-                       return
-               end
        end
 
        redef fun n_kwbreak=(node)
@@ -2998,18 +2729,12 @@ redef class ABreakExpr
                _n_label = node
                if node != null then node.parent = self
        end
-       redef fun n_expr=(node)
-       do
-               _n_expr = node
-               if node != null then node.parent = self
-       end
 
 
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_kwbreak)
                v.enter_visit(_n_label)
-               v.enter_visit(_n_expr)
        end
 end
 redef class AAbortExpr
@@ -3044,16 +2769,13 @@ end
 redef class AContinueExpr
        init init_acontinueexpr (
                n_kwcontinue: nullable TKwcontinue,
-               n_label: nullable ALabel,
-               n_expr: nullable AExpr
+               n_label: nullable ALabel
        )
        do
                _n_kwcontinue = n_kwcontinue
                if n_kwcontinue != null then n_kwcontinue.parent = self
                _n_label = n_label
                if n_label != null then n_label.parent = self
-               _n_expr = n_expr
-               if n_expr != null then n_expr.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -3066,10 +2788,6 @@ redef class AContinueExpr
                        n_label = new_child.as(nullable ALabel)
                        return
                end
-               if _n_expr == old_child then
-                       n_expr = new_child.as(nullable AExpr)
-                       return
-               end
        end
 
        redef fun n_kwcontinue=(node)
@@ -3082,18 +2800,12 @@ redef class AContinueExpr
                _n_label = node
                if node != null then node.parent = self
        end
-       redef fun n_expr=(node)
-       do
-               _n_expr = node
-               if node != null then node.parent = self
-       end
 
 
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_kwcontinue)
                v.enter_visit(_n_label)
-               v.enter_visit(_n_expr)
        end
 end
 redef class ADoExpr
@@ -3155,7 +2867,9 @@ redef class AIfExpr
        init init_aifexpr (
                n_kwif: nullable TKwif,
                n_expr: nullable AExpr,
+               n_kwthen: nullable TKwthen,
                n_then: nullable AExpr,
+               n_kwelse: nullable TKwelse,
                n_else: nullable AExpr
        )
        do
@@ -3163,8 +2877,12 @@ redef class AIfExpr
                n_kwif.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_kwthen = n_kwthen.as(not null)
+               n_kwthen.parent = self
                _n_then = n_then
                if n_then != null then n_then.parent = self
+               _n_kwelse = n_kwelse
+               if n_kwelse != null then n_kwelse.parent = self
                _n_else = n_else
                if n_else != null then n_else.parent = self
        end
@@ -3179,10 +2897,18 @@ redef class AIfExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_kwthen == old_child then
+                       n_kwthen = new_child.as(TKwthen)
+                       return
+               end
                if _n_then == old_child then
                        n_then = new_child.as(nullable AExpr)
                        return
                end
+               if _n_kwelse == old_child then
+                       n_kwelse = new_child.as(nullable TKwelse)
+                       return
+               end
                if _n_else == old_child then
                        n_else = new_child.as(nullable AExpr)
                        return
@@ -3199,11 +2925,21 @@ redef class AIfExpr
                _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
                if node != null then node.parent = self
        end
+       redef fun n_kwelse=(node)
+       do
+               _n_kwelse = node
+               if node != null then node.parent = self
+       end
        redef fun n_else=(node)
        do
                _n_else = node
@@ -3215,7 +2951,9 @@ redef class AIfExpr
        do
                v.enter_visit(_n_kwif)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_kwthen)
                v.enter_visit(_n_then)
+               v.enter_visit(_n_kwelse)
                v.enter_visit(_n_else)
        end
 end
@@ -3452,8 +3190,7 @@ end
 redef class AForExpr
        init init_aforexpr (
                n_kwfor: nullable TKwfor,
-               n_ids: Collection[Object], # Should be Collection[TId]
-               n_expr: nullable AExpr,
+               n_groups: Collection[Object], # Should be Collection[AForGroup]
                n_kwdo: nullable TKwdo,
                n_block: nullable AExpr,
                n_label: nullable ALabel
@@ -3461,9 +3198,7 @@ redef class AForExpr
        do
                _n_kwfor = n_kwfor.as(not null)
                n_kwfor.parent = self
-               _n_ids.unsafe_add_all(n_ids)
-               _n_expr = n_expr.as(not null)
-               n_expr.parent = self
+               self.n_groups.unsafe_add_all(n_groups)
                _n_kwdo = n_kwdo.as(not null)
                n_kwdo.parent = self
                _n_block = n_block
@@ -3478,7 +3213,79 @@ redef class AForExpr
                        n_kwfor = new_child.as(TKwfor)
                        return
                end
-               if _n_ids.replace_child(old_child, new_child) then return
+               if n_groups.replace_child(old_child, new_child) then return
+               if _n_kwdo == old_child then
+                       n_kwdo = new_child.as(TKwdo)
+                       return
+               end
+               if _n_block == old_child then
+                       n_block = new_child.as(nullable AExpr)
+                       return
+               end
+               if _n_label == old_child then
+                       n_label = new_child.as(nullable ALabel)
+                       return
+               end
+       end
+
+       redef fun n_kwfor=(node)
+       do
+               _n_kwfor = 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
+       redef fun n_label=(node)
+       do
+               _n_label = node
+               if node != null then node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_kwfor)
+               n_groups.visit_all(v)
+               v.enter_visit(_n_kwdo)
+               v.enter_visit(_n_block)
+               v.enter_visit(_n_label)
+       end
+end
+redef class AWithExpr
+       init init_awithexpr (
+               n_kwwith: nullable TKwwith,
+               n_expr: nullable AExpr,
+               n_kwdo: nullable TKwdo,
+               n_block: nullable AExpr,
+               n_label: nullable ALabel
+       )
+       do
+               _n_kwwith = n_kwwith.as(not null)
+               n_kwwith.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_kwdo = n_kwdo.as(not null)
+               n_kwdo.parent = self
+               _n_block = n_block
+               if n_block != null then n_block.parent = self
+               _n_label = n_label
+               if n_label != null then n_label.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_kwwith == old_child then
+                       n_kwwith = new_child.as(TKwwith)
+                       return
+               end
                if _n_expr == old_child then
                        n_expr = new_child.as(AExpr)
                        return
@@ -3497,9 +3304,9 @@ redef class AForExpr
                end
        end
 
-       redef fun n_kwfor=(node)
+       redef fun n_kwwith=(node)
        do
-               _n_kwfor = node
+               _n_kwwith = node
                node.parent = self
        end
        redef fun n_expr=(node)
@@ -3526,8 +3333,7 @@ redef class AForExpr
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_kwfor)
-               _n_ids.visit_all(v)
+               v.enter_visit(_n_kwwith)
                v.enter_visit(_n_expr)
                v.enter_visit(_n_kwdo)
                v.enter_visit(_n_block)
@@ -3539,6 +3345,7 @@ redef class AAssertExpr
                n_kwassert: nullable TKwassert,
                n_id: nullable TId,
                n_expr: nullable AExpr,
+               n_kwelse: nullable TKwelse,
                n_else: nullable AExpr
        )
        do
@@ -3548,6 +3355,8 @@ redef class AAssertExpr
                if n_id != null then n_id.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_kwelse = n_kwelse
+               if n_kwelse != null then n_kwelse.parent = self
                _n_else = n_else
                if n_else != null then n_else.parent = self
        end
@@ -3566,6 +3375,10 @@ redef class AAssertExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_kwelse == old_child then
+                       n_kwelse = new_child.as(nullable TKwelse)
+                       return
+               end
                if _n_else == old_child then
                        n_else = new_child.as(nullable AExpr)
                        return
@@ -3587,6 +3400,11 @@ redef class AAssertExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_kwelse=(node)
+       do
+               _n_kwelse = node
+               if node != null then node.parent = self
+       end
        redef fun n_else=(node)
        do
                _n_else = node
@@ -3599,6 +3417,7 @@ redef class AAssertExpr
                v.enter_visit(_n_kwassert)
                v.enter_visit(_n_id)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_kwelse)
                v.enter_visit(_n_else)
        end
 end
@@ -3718,11 +3537,14 @@ end
 redef class AOrExpr
        init init_aorexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TKwor,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3733,6 +3555,10 @@ redef class AOrExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TKwor)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3744,6 +3570,11 @@ redef class AOrExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -3754,17 +3585,21 @@ redef class AOrExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AAndExpr
        init init_aandexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TKwand,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3775,6 +3610,10 @@ redef class AAndExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TKwand)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3786,6 +3625,11 @@ redef class AAndExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -3796,17 +3640,24 @@ redef class AAndExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AOrElseExpr
        init init_aorelseexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TKwor,
+               n_kwelse: nullable TKwelse,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+               _n_kwelse = n_kwelse.as(not null)
+               n_kwelse.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3817,6 +3668,14 @@ redef class AOrElseExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TKwor)
+                       return
+               end
+               if _n_kwelse == old_child then
+                       n_kwelse = new_child.as(TKwelse)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3828,6 +3687,16 @@ redef class AOrElseExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+       redef fun n_kwelse=(node)
+       do
+               _n_kwelse = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -3838,17 +3707,22 @@ redef class AOrElseExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
+               v.enter_visit(_n_kwelse)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AImpliesExpr
        init init_aimpliesexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TKwimplies,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3859,6 +3733,10 @@ redef class AImpliesExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TKwimplies)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3870,6 +3748,11 @@ redef class AImpliesExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -3880,6 +3763,7 @@ redef class AImpliesExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
@@ -3928,11 +3812,14 @@ end
 redef class AEqExpr
        init init_aeqexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TEq,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3943,6 +3830,10 @@ redef class AEqExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TEq)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3954,6 +3845,11 @@ redef class AEqExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -3964,17 +3860,21 @@ redef class AEqExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class ANeExpr
        init init_aneexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TNe,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -3985,6 +3885,10 @@ redef class ANeExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TNe)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -3996,6 +3900,11 @@ redef class ANeExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4006,17 +3915,21 @@ redef class ANeExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class ALtExpr
        init init_altexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TLt,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4027,6 +3940,10 @@ redef class ALtExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TLt)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4038,6 +3955,11 @@ redef class ALtExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4048,17 +3970,21 @@ redef class ALtExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class ALeExpr
        init init_aleexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TLe,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4069,6 +3995,10 @@ redef class ALeExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TLe)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4080,6 +4010,11 @@ redef class ALeExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4090,17 +4025,21 @@ redef class ALeExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class ALlExpr
        init init_allexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TLl,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4111,6 +4050,10 @@ redef class ALlExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TLl)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4122,6 +4065,11 @@ redef class ALlExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4132,17 +4080,21 @@ redef class ALlExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AGtExpr
        init init_agtexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TGt,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4153,6 +4105,10 @@ redef class AGtExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TGt)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4164,6 +4120,11 @@ redef class AGtExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4174,17 +4135,21 @@ redef class AGtExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AGeExpr
        init init_ageexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TGe,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4195,6 +4160,10 @@ redef class AGeExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TGe)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4206,6 +4175,11 @@ redef class AGeExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4216,17 +4190,21 @@ redef class AGeExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AGgExpr
        init init_aggexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TGg,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4237,6 +4215,10 @@ redef class AGgExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TGg)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4248,6 +4230,11 @@ redef class AGgExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4258,17 +4245,21 @@ redef class AGgExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AIsaExpr
        init init_aisaexpr (
                n_expr: nullable AExpr,
+               n_kwisa: nullable TKwisa,
                n_type: nullable AType
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_kwisa = n_kwisa.as(not null)
+               n_kwisa.parent = self
                _n_type = n_type.as(not null)
                n_type.parent = self
        end
@@ -4279,6 +4270,10 @@ redef class AIsaExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_kwisa == old_child then
+                       n_kwisa = new_child.as(TKwisa)
+                       return
+               end
                if _n_type == old_child then
                        n_type = new_child.as(AType)
                        return
@@ -4290,6 +4285,11 @@ redef class AIsaExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_kwisa=(node)
+       do
+               _n_kwisa = node
+               node.parent = self
+       end
        redef fun n_type=(node)
        do
                _n_type = node
@@ -4300,17 +4300,21 @@ redef class AIsaExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_kwisa)
                v.enter_visit(_n_type)
        end
 end
 redef class APlusExpr
        init init_aplusexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TPlus,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4321,6 +4325,10 @@ redef class APlusExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TPlus)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4332,6 +4340,11 @@ redef class APlusExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4342,17 +4355,21 @@ redef class APlusExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AMinusExpr
        init init_aminusexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TMinus,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4363,6 +4380,10 @@ redef class AMinusExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TMinus)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4374,6 +4395,11 @@ redef class AMinusExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4384,17 +4410,21 @@ redef class AMinusExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AStarshipExpr
        init init_astarshipexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TStarship,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4405,6 +4435,10 @@ redef class AStarshipExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TStarship)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4416,7 +4450,12 @@ redef class AStarshipExpr
                _n_expr = node
                node.parent = self
        end
-       redef fun n_expr2=(node)
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+       redef fun n_expr2=(node)
        do
                _n_expr2 = node
                node.parent = self
@@ -4426,17 +4465,21 @@ redef class AStarshipExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
 redef class AStarExpr
        init init_astarexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TStar,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4447,6 +4490,10 @@ redef class AStarExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TStar)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4458,6 +4505,11 @@ redef class AStarExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4468,17 +4520,21 @@ redef class AStarExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
-redef class ASlashExpr
-       init init_aslashexpr (
+redef class AStarstarExpr
+       init init_astarstarexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TStarstar,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4489,6 +4545,10 @@ redef class ASlashExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TStarstar)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4500,6 +4560,11 @@ redef class ASlashExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4510,17 +4575,21 @@ redef class ASlashExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
-redef class APercentExpr
-       init init_apercentexpr (
+redef class ASlashExpr
+       init init_aslashexpr (
                n_expr: nullable AExpr,
+               n_op: nullable TSlash,
                n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
        end
@@ -4531,6 +4600,10 @@ redef class APercentExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TSlash)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -4542,6 +4615,11 @@ redef class APercentExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -4552,129 +4630,133 @@ redef class APercentExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr2)
        end
 end
-redef class AUminusExpr
-       init init_auminusexpr (
-               n_minus: nullable TMinus,
-               n_expr: nullable AExpr
+redef class APercentExpr
+       init init_apercentexpr (
+               n_expr: nullable AExpr,
+               n_op: nullable TPercent,
+               n_expr2: nullable AExpr
        )
        do
-               _n_minus = n_minus.as(not null)
-               n_minus.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.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_minus == old_child then
-                       n_minus = new_child.as(TMinus)
-                       return
-               end
                if _n_expr == old_child then
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_op == old_child then
+                       n_op = new_child.as(TPercent)
+                       return
+               end
+               if _n_expr2 == old_child then
+                       n_expr2 = new_child.as(AExpr)
+                       return
+               end
        end
 
-       redef fun n_minus=(node)
+       redef fun n_expr=(node)
        do
-               _n_minus = node
+               _n_expr = node
                node.parent = self
        end
-       redef fun n_expr=(node)
+       redef fun n_op=(node)
        do
-               _n_expr = node
+               _n_op = 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_minus)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
+               v.enter_visit(_n_expr2)
        end
 end
-redef class ANewExpr
-       init init_anewexpr (
-               n_kwnew: nullable TKwnew,
-               n_type: nullable AType,
-               n_id: nullable TId,
-               n_args: nullable AExprs
+redef class APipeExpr
+       init init_apipeexpr (
+               n_expr: nullable AExpr,
+               n_op: nullable TPipe,
+               n_expr2: nullable AExpr
        )
        do
-               _n_kwnew = n_kwnew.as(not null)
-               n_kwnew.parent = self
-               _n_type = n_type.as(not null)
-               n_type.parent = self
-               _n_id = n_id
-               if n_id != null then n_id.parent = self
-               _n_args = n_args.as(not null)
-               n_args.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_op = n_op.as(not null)
+               n_op.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_kwnew == old_child then
-                       n_kwnew = new_child.as(TKwnew)
-                       return
-               end
-               if _n_type == old_child then
-                       n_type = new_child.as(AType)
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
                        return
                end
-               if _n_id == old_child then
-                       n_id = new_child.as(nullable TId)
+               if _n_op == old_child then
+                       n_op = new_child.as(TPipe)
                        return
                end
-               if _n_args == old_child then
-                       n_args = new_child.as(AExprs)
+               if _n_expr2 == old_child then
+                       n_expr2 = new_child.as(AExpr)
                        return
                end
        end
 
-       redef fun n_kwnew=(node)
+       redef fun n_expr=(node)
        do
-               _n_kwnew = node
+               _n_expr = node
                node.parent = self
        end
-       redef fun n_type=(node)
+       redef fun n_op=(node)
        do
-               _n_type = node
+               _n_op = node
                node.parent = self
        end
-       redef fun n_id=(node)
-       do
-               _n_id = node
-               if node != null then node.parent = self
-       end
-       redef fun n_args=(node)
+       redef fun n_expr2=(node)
        do
-               _n_args = node
+               _n_expr2 = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_kwnew)
-               v.enter_visit(_n_type)
-               v.enter_visit(_n_id)
-               v.enter_visit(_n_args)
+               v.enter_visit(_n_expr)
+               v.enter_visit(_n_op)
+               v.enter_visit(_n_expr2)
        end
 end
-redef class AAttrExpr
-       init init_aattrexpr (
+redef class ACaretExpr
+       init init_acaretexpr (
                n_expr: nullable AExpr,
-               n_id: nullable TAttrid
+               n_op: nullable TCaret,
+               n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
-               _n_id = n_id.as(not null)
-               n_id.parent = self
+               _n_op = n_op.as(not null)
+               n_op.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)
@@ -4683,8 +4765,12 @@ redef class AAttrExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
-               if _n_id == old_child then
-                       n_id = new_child.as(TAttrid)
+               if _n_op == old_child then
+                       n_op = new_child.as(TCaret)
+                       return
+               end
+               if _n_expr2 == old_child then
+                       n_expr2 = new_child.as(AExpr)
                        return
                end
        end
@@ -4694,9 +4780,14 @@ redef class AAttrExpr
                _n_expr = node
                node.parent = self
        end
-       redef fun n_id=(node)
+       redef fun n_op=(node)
        do
-               _n_id = node
+               _n_op = node
+               node.parent = self
+       end
+       redef fun n_expr2=(node)
+       do
+               _n_expr2 = node
                node.parent = self
        end
 
@@ -4704,25 +4795,23 @@ redef class AAttrExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
-               v.enter_visit(_n_id)
+               v.enter_visit(_n_op)
+               v.enter_visit(_n_expr2)
        end
 end
-redef class AAttrAssignExpr
-       init init_aattrassignexpr (
+redef class AAmpExpr
+       init init_aampexpr (
                n_expr: nullable AExpr,
-               n_id: nullable TAttrid,
-               n_assign: nullable TAssign,
-               n_value: nullable AExpr
+               n_op: nullable TAmp,
+               n_expr2: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
-               _n_id = n_id.as(not null)
-               n_id.parent = self
-               _n_assign = n_assign.as(not null)
-               n_assign.parent = self
-               _n_value = n_value.as(not null)
-               n_value.parent = self
+               _n_op = n_op.as(not null)
+               n_op.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)
@@ -4731,16 +4820,12 @@ redef class AAttrAssignExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
-               if _n_id == old_child then
-                       n_id = new_child.as(TAttrid)
-                       return
-               end
-               if _n_assign == old_child then
-                       n_assign = new_child.as(TAssign)
+               if _n_op == old_child then
+                       n_op = new_child.as(TAmp)
                        return
                end
-               if _n_value == old_child then
-                       n_value = new_child.as(AExpr)
+               if _n_expr2 == old_child then
+                       n_expr2 = new_child.as(AExpr)
                        return
                end
        end
@@ -4750,19 +4835,14 @@ redef class AAttrAssignExpr
                _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)
+       redef fun n_op=(node)
        do
-               _n_assign = node
+               _n_op = node
                node.parent = self
        end
-       redef fun n_value=(node)
+       redef fun n_expr2=(node)
        do
-               _n_value = node
+               _n_expr2 = node
                node.parent = self
        end
 
@@ -4770,140 +4850,251 @@ redef class AAttrAssignExpr
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_expr)
-               v.enter_visit(_n_id)
-               v.enter_visit(_n_assign)
-               v.enter_visit(_n_value)
+               v.enter_visit(_n_op)
+               v.enter_visit(_n_expr2)
        end
 end
-redef class AAttrReassignExpr
-       init init_aattrreassignexpr (
-               n_expr: nullable AExpr,
-               n_id: nullable TAttrid,
-               n_assign_op: nullable AAssignOp,
-               n_value: nullable AExpr
+redef class AUminusExpr
+       init init_auminusexpr (
+               n_op: nullable TMinus,
+               n_expr: nullable AExpr
        )
        do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
-               _n_id = n_id.as(not null)
-               n_id.parent = self
-               _n_assign_op = n_assign_op.as(not null)
-               n_assign_op.parent = self
-               _n_value = n_value.as(not null)
-               n_value.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_expr == old_child then
-                       n_expr = new_child.as(AExpr)
-                       return
-               end
-               if _n_id == old_child then
-                       n_id = new_child.as(TAttrid)
-                       return
-               end
-               if _n_assign_op == old_child then
-                       n_assign_op = new_child.as(AAssignOp)
+               if _n_op == old_child then
+                       n_op = new_child.as(TMinus)
                        return
                end
-               if _n_value == old_child then
-                       n_value = new_child.as(AExpr)
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
                        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_assign_op=(node)
+       redef fun n_op=(node)
        do
-               _n_assign_op = node
+               _n_op = node
                node.parent = self
        end
-       redef fun n_value=(node)
+       redef fun n_expr=(node)
        do
-               _n_value = node
+               _n_expr = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr)
-               v.enter_visit(_n_id)
-               v.enter_visit(_n_assign_op)
-               v.enter_visit(_n_value)
        end
 end
-redef class ACallExpr
-       init init_acallexpr (
-               n_expr: nullable AExpr,
-               n_id: nullable TId,
-               n_args: nullable AExprs
+redef class AUplusExpr
+       init init_auplusexpr (
+               n_op: nullable TPlus,
+               n_expr: nullable AExpr
        )
        do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
-               _n_id = n_id.as(not null)
-               n_id.parent = self
-               _n_args = n_args.as(not null)
-               n_args.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_expr == old_child then
-                       n_expr = new_child.as(AExpr)
-                       return
-               end
-               if _n_id == old_child then
-                       n_id = new_child.as(TId)
+               if _n_op == old_child then
+                       n_op = new_child.as(TPlus)
                        return
                end
-               if _n_args == old_child then
-                       n_args = new_child.as(AExprs)
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
                        return
                end
        end
 
-       redef fun n_expr=(node)
-       do
-               _n_expr = node
-               node.parent = self
-       end
-       redef fun n_id=(node)
+       redef fun n_op=(node)
        do
-               _n_id = node
+               _n_op = node
                node.parent = self
        end
-       redef fun n_args=(node)
+       redef fun n_expr=(node)
        do
-               _n_args = node
+               _n_expr = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
+               v.enter_visit(_n_op)
                v.enter_visit(_n_expr)
-               v.enter_visit(_n_id)
-               v.enter_visit(_n_args)
        end
 end
-redef class ACallAssignExpr
-       init init_acallassignexpr (
-               n_expr: nullable AExpr,
-               n_id: nullable TId,
-               n_args: nullable AExprs,
-               n_assign: nullable TAssign,
+redef class AUtildeExpr
+       init init_autildeexpr (
+               n_op: nullable TTilde,
+               n_expr: nullable AExpr
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TTilde)
+                       return
+               end
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = 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_op)
+               v.enter_visit(_n_expr)
+       end
+end
+redef class ANewExpr
+       init init_anewexpr (
+               n_kwnew: nullable TKwnew,
+               n_type: nullable AType,
+               n_qid: nullable AQid,
+               n_args: nullable AExprs
+       )
+       do
+               _n_kwnew = n_kwnew.as(not null)
+               n_kwnew.parent = self
+               _n_type = n_type.as(not null)
+               n_type.parent = self
+               _n_qid = n_qid
+               if n_qid != null then n_qid.parent = self
+               _n_args = n_args.as(not null)
+               n_args.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_kwnew == old_child then
+                       n_kwnew = new_child.as(TKwnew)
+                       return
+               end
+               if _n_type == old_child then
+                       n_type = new_child.as(AType)
+                       return
+               end
+               if _n_qid == old_child then
+                       n_qid = new_child.as(nullable AQid)
+                       return
+               end
+               if _n_args == old_child then
+                       n_args = new_child.as(AExprs)
+                       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_qid=(node)
+       do
+               _n_qid = node
+               if node != null then 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_kwnew)
+               v.enter_visit(_n_type)
+               v.enter_visit(_n_qid)
+               v.enter_visit(_n_args)
+       end
+end
+redef class AAttrExpr
+       init init_aattrexpr (
+               n_expr: nullable AExpr,
+               n_id: nullable TAttrid
+       )
+       do
+               _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_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+               if _n_id == old_child then
+                       n_id = new_child.as(TAttrid)
+                       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 visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_expr)
+               v.enter_visit(_n_id)
+       end
+end
+redef class AAttrAssignExpr
+       init init_aattrassignexpr (
+               n_expr: nullable AExpr,
+               n_id: nullable TAttrid,
+               n_assign: nullable TAssign,
                n_value: nullable AExpr
        )
        do
@@ -4911,8 +5102,6 @@ redef class ACallAssignExpr
                n_expr.parent = self
                _n_id = n_id.as(not null)
                n_id.parent = self
-               _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)
@@ -4926,11 +5115,7 @@ redef class ACallAssignExpr
                        return
                end
                if _n_id == old_child then
-                       n_id = new_child.as(TId)
-                       return
-               end
-               if _n_args == old_child then
-                       n_args = new_child.as(AExprs)
+                       n_id = new_child.as(TAttrid)
                        return
                end
                if _n_assign == old_child then
@@ -4953,11 +5138,6 @@ redef class ACallAssignExpr
                _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
@@ -4974,16 +5154,14 @@ redef class ACallAssignExpr
        do
                v.enter_visit(_n_expr)
                v.enter_visit(_n_id)
-               v.enter_visit(_n_args)
                v.enter_visit(_n_assign)
                v.enter_visit(_n_value)
        end
 end
-redef class ACallReassignExpr
-       init init_acallreassignexpr (
+redef class AAttrReassignExpr
+       init init_aattrreassignexpr (
                n_expr: nullable AExpr,
-               n_id: nullable TId,
-               n_args: nullable AExprs,
+               n_id: nullable TAttrid,
                n_assign_op: nullable AAssignOp,
                n_value: nullable AExpr
        )
@@ -4992,8 +5170,6 @@ redef class ACallReassignExpr
                n_expr.parent = self
                _n_id = n_id.as(not null)
                n_id.parent = self
-               _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)
@@ -5007,11 +5183,7 @@ redef class ACallReassignExpr
                        return
                end
                if _n_id == old_child then
-                       n_id = new_child.as(TId)
-                       return
-               end
-               if _n_args == old_child then
-                       n_args = new_child.as(AExprs)
+                       n_id = new_child.as(TAttrid)
                        return
                end
                if _n_assign_op == old_child then
@@ -5034,11 +5206,6 @@ redef class ACallReassignExpr
                _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
@@ -5055,34 +5222,33 @@ redef class ACallReassignExpr
        do
                v.enter_visit(_n_expr)
                v.enter_visit(_n_id)
-               v.enter_visit(_n_args)
                v.enter_visit(_n_assign_op)
                v.enter_visit(_n_value)
        end
 end
-redef class ASuperExpr
-       init init_asuperexpr (
-               n_qualified: nullable AQualified,
-               n_kwsuper: nullable TKwsuper,
+redef class ACallExpr
+       init init_acallexpr (
+               n_expr: nullable AExpr,
+               n_qid: nullable AQid,
                n_args: nullable AExprs
        )
        do
-               _n_qualified = n_qualified
-               if n_qualified != null then n_qualified.parent = self
-               _n_kwsuper = n_kwsuper.as(not null)
-               n_kwsuper.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_qid = n_qid.as(not null)
+               n_qid.parent = self
                _n_args = n_args.as(not null)
                n_args.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_qualified == old_child then
-                       n_qualified = new_child.as(nullable AQualified)
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
                        return
                end
-               if _n_kwsuper == old_child then
-                       n_kwsuper = new_child.as(TKwsuper)
+               if _n_qid == old_child then
+                       n_qid = new_child.as(AQid)
                        return
                end
                if _n_args == old_child then
@@ -5091,14 +5257,14 @@ redef class ASuperExpr
                end
        end
 
-       redef fun n_qualified=(node)
+       redef fun n_expr=(node)
        do
-               _n_qualified = node
-               if node != null then node.parent = self
+               _n_expr = node
+               node.parent = self
        end
-       redef fun n_kwsuper=(node)
+       redef fun n_qid=(node)
        do
-               _n_kwsuper = node
+               _n_qid = node
                node.parent = self
        end
        redef fun n_args=(node)
@@ -5110,24 +5276,30 @@ redef class ASuperExpr
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_qualified)
-               v.enter_visit(_n_kwsuper)
+               v.enter_visit(_n_expr)
+               v.enter_visit(_n_qid)
                v.enter_visit(_n_args)
        end
 end
-redef class AInitExpr
-       init init_ainitexpr (
+redef class ACallAssignExpr
+       init init_acallassignexpr (
                n_expr: nullable AExpr,
-               n_kwinit: nullable TKwinit,
-               n_args: nullable AExprs
+               n_qid: nullable AQid,
+               n_args: nullable AExprs,
+               n_assign: nullable TAssign,
+               n_value: nullable AExpr
        )
        do
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
-               _n_kwinit = n_kwinit.as(not null)
-               n_kwinit.parent = self
+               _n_qid = n_qid.as(not null)
+               n_qid.parent = self
                _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)
+               n_value.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5136,14 +5308,22 @@ redef class AInitExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
-               if _n_kwinit == old_child then
-                       n_kwinit = new_child.as(TKwinit)
+               if _n_qid == old_child then
+                       n_qid = new_child.as(AQid)
                        return
                end
                if _n_args == old_child then
                        n_args = new_child.as(AExprs)
                        return
                end
+               if _n_assign == old_child then
+                       n_assign = new_child.as(TAssign)
+                       return
+               end
+               if _n_value == old_child then
+                       n_value = new_child.as(AExpr)
+                       return
+               end
        end
 
        redef fun n_expr=(node)
@@ -5151,9 +5331,9 @@ redef class AInitExpr
                _n_expr = node
                node.parent = self
        end
-       redef fun n_kwinit=(node)
+       redef fun n_qid=(node)
        do
-               _n_kwinit = node
+               _n_qid = node
                node.parent = self
        end
        redef fun n_args=(node)
@@ -5161,19 +5341,222 @@ redef class AInitExpr
                _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_kwinit)
+               v.enter_visit(_n_qid)
                v.enter_visit(_n_args)
+               v.enter_visit(_n_assign)
+               v.enter_visit(_n_value)
        end
 end
-redef class ABraExpr
-       init init_abraexpr (
+redef class ACallReassignExpr
+       init init_acallreassignexpr (
                n_expr: nullable AExpr,
-               n_args: nullable AExprs
+               n_qid: nullable AQid,
+               n_args: nullable AExprs,
+               n_assign_op: nullable AAssignOp,
+               n_value: nullable AExpr
+       )
+       do
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_qid = n_qid.as(not null)
+               n_qid.parent = self
+               _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)
+               n_value.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+               if _n_qid == old_child then
+                       n_qid = new_child.as(AQid)
+                       return
+               end
+               if _n_args == old_child then
+                       n_args = new_child.as(AExprs)
+                       return
+               end
+               if _n_assign_op == old_child then
+                       n_assign_op = new_child.as(AAssignOp)
+                       return
+               end
+               if _n_value == old_child then
+                       n_value = new_child.as(AExpr)
+                       return
+               end
+       end
+
+       redef fun n_expr=(node)
+       do
+               _n_expr = node
+               node.parent = self
+       end
+       redef fun n_qid=(node)
+       do
+               _n_qid = 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_qid)
+               v.enter_visit(_n_args)
+               v.enter_visit(_n_assign_op)
+               v.enter_visit(_n_value)
+       end
+end
+redef class ASuperExpr
+       init init_asuperexpr (
+               n_qualified: nullable AQualified,
+               n_kwsuper: nullable TKwsuper,
+               n_args: nullable AExprs
+       )
+       do
+               _n_qualified = n_qualified
+               if n_qualified != null then n_qualified.parent = self
+               _n_kwsuper = n_kwsuper.as(not null)
+               n_kwsuper.parent = self
+               _n_args = n_args.as(not null)
+               n_args.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_qualified == old_child then
+                       n_qualified = new_child.as(nullable AQualified)
+                       return
+               end
+               if _n_kwsuper == old_child then
+                       n_kwsuper = new_child.as(TKwsuper)
+                       return
+               end
+               if _n_args == old_child then
+                       n_args = new_child.as(AExprs)
+                       return
+               end
+       end
+
+       redef fun n_qualified=(node)
+       do
+               _n_qualified = node
+               if node != null then node.parent = self
+       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
+               v.enter_visit(_n_qualified)
+               v.enter_visit(_n_kwsuper)
+               v.enter_visit(_n_args)
+       end
+end
+redef class AInitExpr
+       init init_ainitexpr (
+               n_expr: nullable AExpr,
+               n_kwinit: nullable TKwinit,
+               n_args: nullable AExprs
+       )
+       do
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_kwinit = n_kwinit.as(not null)
+               n_kwinit.parent = self
+               _n_args = n_args.as(not null)
+               n_args.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+               if _n_kwinit == old_child then
+                       n_kwinit = new_child.as(TKwinit)
+                       return
+               end
+               if _n_args == old_child then
+                       n_args = new_child.as(AExprs)
+                       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)
+               v.enter_visit(_n_args)
+       end
+end
+redef class ABraExpr
+       init init_abraexpr (
+               n_expr: nullable AExpr,
+               n_args: nullable AExprs
        )
        do
                _n_expr = n_expr.as(not null)
@@ -5546,6 +5929,7 @@ redef class ACrangeExpr
        init init_acrangeexpr (
                n_obra: nullable TObra,
                n_expr: nullable AExpr,
+               n_dotdot: nullable TDotdot,
                n_expr2: nullable AExpr,
                n_cbra: nullable TCbra,
                n_annotations: nullable AAnnotations
@@ -5555,6 +5939,8 @@ redef class ACrangeExpr
                n_obra.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_dotdot = n_dotdot.as(not null)
+               n_dotdot.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
                _n_cbra = n_cbra.as(not null)
@@ -5573,6 +5959,10 @@ redef class ACrangeExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_dotdot == old_child then
+                       n_dotdot = new_child.as(TDotdot)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -5597,6 +5987,11 @@ redef class ACrangeExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_dotdot=(node)
+       do
+               _n_dotdot = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -5618,6 +6013,7 @@ redef class ACrangeExpr
        do
                v.enter_visit(_n_obra)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_dotdot)
                v.enter_visit(_n_expr2)
                v.enter_visit(_n_cbra)
                v.enter_visit(_n_annotations)
@@ -5627,6 +6023,7 @@ redef class AOrangeExpr
        init init_aorangeexpr (
                n_obra: nullable TObra,
                n_expr: nullable AExpr,
+               n_dotdot: nullable TDotdot,
                n_expr2: nullable AExpr,
                n_cbra: nullable TObra,
                n_annotations: nullable AAnnotations
@@ -5636,6 +6033,8 @@ redef class AOrangeExpr
                n_obra.parent = self
                _n_expr = n_expr.as(not null)
                n_expr.parent = self
+               _n_dotdot = n_dotdot.as(not null)
+               n_dotdot.parent = self
                _n_expr2 = n_expr2.as(not null)
                n_expr2.parent = self
                _n_cbra = n_cbra.as(not null)
@@ -5654,6 +6053,10 @@ redef class AOrangeExpr
                        n_expr = new_child.as(AExpr)
                        return
                end
+               if _n_dotdot == old_child then
+                       n_dotdot = new_child.as(TDotdot)
+                       return
+               end
                if _n_expr2 == old_child then
                        n_expr2 = new_child.as(AExpr)
                        return
@@ -5678,6 +6081,11 @@ redef class AOrangeExpr
                _n_expr = node
                node.parent = self
        end
+       redef fun n_dotdot=(node)
+       do
+               _n_dotdot = node
+               node.parent = self
+       end
        redef fun n_expr2=(node)
        do
                _n_expr2 = node
@@ -5699,6 +6107,7 @@ redef class AOrangeExpr
        do
                v.enter_visit(_n_obra)
                v.enter_visit(_n_expr)
+               v.enter_visit(_n_dotdot)
                v.enter_visit(_n_expr2)
                v.enter_visit(_n_cbra)
                v.enter_visit(_n_annotations)
@@ -5706,20 +6115,37 @@ redef class AOrangeExpr
 end
 redef class AArrayExpr
        init init_aarrayexpr (
-               n_exprs: nullable AExprs,
+               n_obra: nullable TObra,
+               n_exprs: Collection[Object], # Should be Collection[AExpr]
+               n_type: nullable AType,
+               n_cbra: nullable TCbra,
                n_annotations: nullable AAnnotations
        )
        do
-               _n_exprs = n_exprs.as(not null)
-               n_exprs.parent = self
+               _n_obra = n_obra.as(not null)
+               n_obra.parent = self
+               self.n_exprs.unsafe_add_all(n_exprs)
+               _n_type = n_type
+               if n_type != null then n_type.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
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_exprs == old_child then
-                       n_exprs = new_child.as(AExprs)
+               if _n_obra == old_child then
+                       n_obra = new_child.as(TObra)
+                       return
+               end
+               if n_exprs.replace_child(old_child, new_child) then return
+               if _n_type == old_child then
+                       n_type = new_child.as(nullable AType)
+                       return
+               end
+               if _n_cbra == old_child then
+                       n_cbra = new_child.as(TCbra)
                        return
                end
                if _n_annotations == old_child then
@@ -5728,9 +6154,19 @@ redef class AArrayExpr
                end
        end
 
-       redef fun n_exprs=(node)
+       redef fun n_obra=(node)
        do
-               _n_exprs = node
+               _n_obra = node
+               node.parent = self
+       end
+       redef fun n_type=(node)
+       do
+               _n_type = node
+               if node != null then node.parent = self
+       end
+       redef fun n_cbra=(node)
+       do
+               _n_cbra = node
                node.parent = self
        end
        redef fun n_annotations=(node)
@@ -5742,7 +6178,10 @@ redef class AArrayExpr
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_exprs)
+               v.enter_visit(_n_obra)
+               n_exprs.visit_all(v)
+               v.enter_visit(_n_type)
+               v.enter_visit(_n_cbra)
                v.enter_visit(_n_annotations)
        end
 end
@@ -5929,64 +6368,22 @@ redef class ANullExpr
                v.enter_visit(_n_annotations)
        end
 end
-redef class ADecIntExpr
-       init init_adecintexpr (
-               n_number: nullable TNumber,
-               n_annotations: nullable AAnnotations
-       )
-       do
-               _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
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_number == old_child then
-                       n_number = new_child.as(TNumber)
-                       return
-               end
-               if _n_annotations == old_child then
-                       n_annotations = new_child.as(nullable AAnnotations)
-                       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
-
-
-       redef fun visit_all(v: Visitor)
-       do
-               v.enter_visit(_n_number)
-               v.enter_visit(_n_annotations)
-       end
-end
-redef class AHexIntExpr
-       init init_ahexintexpr (
-               n_hex_number: nullable THexNumber,
+redef class AIntegerExpr
+       init init_aintegerexpr (
+               n_integer: nullable TInteger,
                n_annotations: nullable AAnnotations
        )
        do
-               _n_hex_number = n_hex_number.as(not null)
-               n_hex_number.parent = self
+               _n_integer = n_integer.as(not null)
+               n_integer.parent = self
                _n_annotations = n_annotations
                if n_annotations != null then n_annotations.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_hex_number == old_child then
-                       n_hex_number = new_child.as(THexNumber)
+               if _n_integer == old_child then
+                       n_integer = new_child.as(TInteger)
                        return
                end
                if _n_annotations == old_child then
@@ -5995,9 +6392,9 @@ redef class AHexIntExpr
                end
        end
 
-       redef fun n_hex_number=(node)
+       redef fun n_integer=(node)
        do
-               _n_hex_number = node
+               _n_integer = node
                node.parent = self
        end
        redef fun n_annotations=(node)
@@ -6009,7 +6406,7 @@ redef class AHexIntExpr
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_hex_number)
+               v.enter_visit(_n_integer)
                v.enter_visit(_n_annotations)
        end
 end
@@ -6232,14 +6629,14 @@ redef class ASuperstringExpr
                n_annotations: nullable AAnnotations
        )
        do
-               _n_exprs.unsafe_add_all(n_exprs)
+               self.n_exprs.unsafe_add_all(n_exprs)
                _n_annotations = n_annotations
                if n_annotations != null then n_annotations.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_exprs.replace_child(old_child, new_child) then return
+               if n_exprs.replace_child(old_child, new_child) then return
                if _n_annotations == old_child then
                        n_annotations = new_child.as(nullable AAnnotations)
                        return
@@ -6255,7 +6652,7 @@ redef class ASuperstringExpr
 
        redef fun visit_all(v: Visitor)
        do
-               _n_exprs.visit_all(v)
+               n_exprs.visit_all(v)
                v.enter_visit(_n_annotations)
        end
 end
@@ -6625,24 +7022,241 @@ redef class ADebugTypeExpr
                v.enter_visit(_n_type)
        end
 end
-redef class AListExprs
-       init init_alistexprs (
+redef class AVarargExpr
+       init init_avarargexpr (
+               n_expr: nullable AExpr,
+               n_dotdotdot: nullable TDotdotdot
+       )
+       do
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+               _n_dotdotdot = n_dotdotdot.as(not null)
+               n_dotdotdot.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+               if _n_dotdotdot == old_child then
+                       n_dotdotdot = new_child.as(TDotdotdot)
+                       return
+               end
+       end
+
+       redef fun n_expr=(node)
+       do
+               _n_expr = node
+               node.parent = self
+       end
+       redef fun n_dotdotdot=(node)
+       do
+               _n_dotdotdot = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_expr)
+               v.enter_visit(_n_dotdotdot)
+       end
+end
+redef class ANamedargExpr
+       init init_anamedargexpr (
+               n_id: nullable TId,
+               n_assign: nullable TAssign,
+               n_expr: nullable AExpr
+       )
+       do
+               _n_id = n_id.as(not null)
+               n_id.parent = self
+               _n_assign = n_assign.as(not null)
+               n_assign.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_id == old_child then
+                       n_id = new_child.as(TId)
+                       return
+               end
+               if _n_assign == old_child then
+                       n_assign = new_child.as(TAssign)
+                       return
+               end
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               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_expr=(node)
+       do
+               _n_expr = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_id)
+               v.enter_visit(_n_assign)
+               v.enter_visit(_n_expr)
+       end
+end
+redef class ATypeExpr
+       init init_atypeexpr (
+               n_type: nullable AType
+       )
+       do
+               _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
+                       n_type = new_child.as(AType)
+                       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 AMethidExpr
+       init init_amethidexpr (
+               n_expr: nullable AExpr,
+               n_id: nullable AMethid
+       )
+       do
+               _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_expr == old_child then
+                       n_expr = new_child.as(AExpr)
+                       return
+               end
+               if _n_id == old_child then
+                       n_id = new_child.as(AMethid)
+                       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 visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_expr)
+               v.enter_visit(_n_id)
+       end
+end
+redef class AAtExpr
+       init init_aatexpr (
+               n_annotations: nullable AAnnotations
+       )
+       do
+               _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_annotations == old_child then
+                       n_annotations = new_child.as(AAnnotations)
+                       return
+               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_annotations)
+       end
+end
+redef class AManyExpr
+       init init_amanyexpr (
                n_exprs: Collection[Object] # Should be Collection[AExpr]
        )
        do
-               _n_exprs.unsafe_add_all(n_exprs)
+               self.n_exprs.unsafe_add_all(n_exprs)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_exprs.replace_child(old_child, new_child) then return
+               if n_exprs.replace_child(old_child, new_child) then return
        end
 
 
 
        redef fun visit_all(v: Visitor)
        do
-               _n_exprs.visit_all(v)
+               n_exprs.visit_all(v)
+       end
+end
+redef class AListExprs
+       init init_alistexprs (
+               n_exprs: Collection[Object] # Should be Collection[AExpr]
+       )
+       do
+               self.n_exprs.unsafe_add_all(n_exprs)
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if n_exprs.replace_child(old_child, new_child) then return
+       end
+
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               n_exprs.visit_all(v)
        end
 end
 redef class AParExprs
@@ -6654,145 +7268,452 @@ redef class AParExprs
        do
                _n_opar = n_opar.as(not null)
                n_opar.parent = self
-               _n_exprs.unsafe_add_all(n_exprs)
+               self.n_exprs.unsafe_add_all(n_exprs)
                _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
-                       n_opar = new_child.as(TOpar)
-                       return
-               end
-               if _n_exprs.replace_child(old_child, new_child) then return
-               if _n_cpar == old_child then
-                       n_cpar = new_child.as(TCpar)
+               if _n_opar == old_child then
+                       n_opar = new_child.as(TOpar)
+                       return
+               end
+               if n_exprs.replace_child(old_child, new_child) then return
+               if _n_cpar == old_child then
+                       n_cpar = new_child.as(TCpar)
+                       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)
+               n_exprs.visit_all(v)
+               v.enter_visit(_n_cpar)
+       end
+end
+redef class ABraExprs
+       init init_abraexprs (
+               n_obra: nullable TObra,
+               n_exprs: Collection[Object], # Should be Collection[AExpr]
+               n_cbra: nullable TCbra
+       )
+       do
+               _n_obra = n_obra.as(not null)
+               n_obra.parent = self
+               self.n_exprs.unsafe_add_all(n_exprs)
+               _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
+                       n_obra = new_child.as(TObra)
+                       return
+               end
+               if n_exprs.replace_child(old_child, new_child) then return
+               if _n_cbra == old_child then
+                       n_cbra = new_child.as(TCbra)
+                       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)
+               n_exprs.visit_all(v)
+               v.enter_visit(_n_cbra)
+       end
+end
+redef class APlusAssignOp
+       init init_aplusassignop (
+               n_op: nullable TPluseq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TPluseq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class AMinusAssignOp
+       init init_aminusassignop (
+               n_op: nullable TMinuseq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TMinuseq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class AStarAssignOp
+       init init_astarassignop (
+               n_op: nullable TStareq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TStareq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class ASlashAssignOp
+       init init_aslashassignop (
+               n_op: nullable TSlasheq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TSlasheq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class APercentAssignOp
+       init init_apercentassignop (
+               n_op: nullable TPercenteq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TPercenteq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class AStarstarAssignOp
+       init init_astarstarassignop (
+               n_op: nullable TStarstareq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TStarstareq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class APipeAssignOp
+       init init_apipeassignop (
+               n_op: nullable TPipeeq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TPipeeq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class ACaretAssignOp
+       init init_acaretassignop (
+               n_op: nullable TCareteq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TCareteq)
+                       return
+               end
+       end
+
+       redef fun n_op=(node)
+       do
+               _n_op = node
+               node.parent = self
+       end
+
+
+       redef fun visit_all(v: Visitor)
+       do
+               v.enter_visit(_n_op)
+       end
+end
+redef class AAmpAssignOp
+       init init_aampassignop (
+               n_op: nullable TAmpeq
+       )
+       do
+               _n_op = n_op.as(not null)
+               n_op.parent = self
+       end
+
+       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+       do
+               if _n_op == old_child then
+                       n_op = new_child.as(TAmpeq)
                        return
                end
        end
 
-       redef fun n_opar=(node)
+       redef fun n_op=(node)
        do
-               _n_opar = node
-               node.parent = self
-       end
-       redef fun n_cpar=(node)
-       do
-               _n_cpar = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_opar)
-               _n_exprs.visit_all(v)
-               v.enter_visit(_n_cpar)
+               v.enter_visit(_n_op)
        end
 end
-redef class ABraExprs
-       init init_abraexprs (
-               n_obra: nullable TObra,
-               n_exprs: Collection[Object], # Should be Collection[AExpr]
-               n_cbra: nullable TCbra
+redef class ALlAssignOp
+       init init_allassignop (
+               n_op: nullable TLleq
        )
        do
-               _n_obra = n_obra.as(not null)
-               n_obra.parent = self
-               _n_exprs.unsafe_add_all(n_exprs)
-               _n_cbra = n_cbra.as(not null)
-               n_cbra.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_obra == old_child then
-                       n_obra = new_child.as(TObra)
-                       return
-               end
-               if _n_exprs.replace_child(old_child, new_child) then return
-               if _n_cbra == old_child then
-                       n_cbra = new_child.as(TCbra)
+               if _n_op == old_child then
+                       n_op = new_child.as(TLleq)
                        return
                end
        end
 
-       redef fun n_obra=(node)
+       redef fun n_op=(node)
        do
-               _n_obra = node
-               node.parent = self
-       end
-       redef fun n_cbra=(node)
-       do
-               _n_cbra = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_obra)
-               _n_exprs.visit_all(v)
-               v.enter_visit(_n_cbra)
+               v.enter_visit(_n_op)
        end
 end
-redef class APlusAssignOp
-       init init_aplusassignop (
-               n_pluseq: nullable TPluseq
+redef class AGgAssignOp
+       init init_aggassignop (
+               n_op: nullable TGgeq
        )
        do
-               _n_pluseq = n_pluseq.as(not null)
-               n_pluseq.parent = self
+               _n_op = n_op.as(not null)
+               n_op.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_pluseq == old_child then
-                       n_pluseq = new_child.as(TPluseq)
+               if _n_op == old_child then
+                       n_op = new_child.as(TGgeq)
                        return
                end
        end
 
-       redef fun n_pluseq=(node)
+       redef fun n_op=(node)
        do
-               _n_pluseq = node
+               _n_op = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_pluseq)
+               v.enter_visit(_n_op)
        end
 end
-redef class AMinusAssignOp
-       init init_aminusassignop (
-               n_minuseq: nullable TMinuseq
+redef class AForGroup
+       init init_aforgroup (
+               n_ids: Collection[Object], # Should be Collection[TId]
+               n_kwin: nullable TKwin,
+               n_expr: nullable AExpr
        )
        do
-               _n_minuseq = n_minuseq.as(not null)
-               n_minuseq.parent = self
+               self.n_ids.unsafe_add_all(n_ids)
+               _n_kwin = n_kwin.as(not null)
+               n_kwin.parent = self
+               _n_expr = n_expr.as(not null)
+               n_expr.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_minuseq == old_child then
-                       n_minuseq = new_child.as(TMinuseq)
+               if n_ids.replace_child(old_child, new_child) then return
+               if _n_kwin == old_child then
+                       n_kwin = new_child.as(TKwin)
+                       return
+               end
+               if _n_expr == old_child then
+                       n_expr = new_child.as(AExpr)
                        return
                end
        end
 
-       redef fun n_minuseq=(node)
+       redef fun n_kwin=(node)
+       do
+               _n_kwin = node
+               node.parent = self
+       end
+       redef fun n_expr=(node)
        do
-               _n_minuseq = node
+               _n_expr = node
                node.parent = self
        end
 
 
        redef fun visit_all(v: Visitor)
        do
-               v.enter_visit(_n_minuseq)
+               n_ids.visit_all(v)
+               v.enter_visit(_n_kwin)
+               v.enter_visit(_n_expr)
        end
 end
 redef class AModuleName
@@ -6804,7 +7725,7 @@ redef class AModuleName
        do
                _n_quad = n_quad
                if n_quad != null then n_quad.parent = self
-               _n_path.unsafe_add_all(n_path)
+               self.n_path.unsafe_add_all(n_path)
                _n_id = n_id.as(not null)
                n_id.parent = self
        end
@@ -6815,7 +7736,7 @@ redef class AModuleName
                        n_quad = new_child.as(nullable TQuad)
                        return
                end
-               if _n_path.replace_child(old_child, new_child) then return
+               if n_path.replace_child(old_child, new_child) then return
                if _n_id == old_child then
                        n_id = new_child.as(TId)
                        return
@@ -6837,7 +7758,7 @@ redef class AModuleName
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_quad)
-               _n_path.visit_all(v)
+               n_path.visit_all(v)
                v.enter_visit(_n_id)
        end
 end
@@ -6849,7 +7770,7 @@ redef class AExternCalls
        do
                _n_kwimport = n_kwimport.as(not null)
                n_kwimport.parent = self
-               _n_extern_calls.unsafe_add_all(n_extern_calls)
+               self.n_extern_calls.unsafe_add_all(n_extern_calls)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -6858,7 +7779,7 @@ redef class AExternCalls
                        n_kwimport = new_child.as(TKwimport)
                        return
                end
-               if _n_extern_calls.replace_child(old_child, new_child) then return
+               if n_extern_calls.replace_child(old_child, new_child) then return
        end
 
        redef fun n_kwimport=(node)
@@ -6871,7 +7792,7 @@ redef class AExternCalls
        redef fun visit_all(v: Visitor)
        do
                v.enter_visit(_n_kwimport)
-               _n_extern_calls.visit_all(v)
+               n_extern_calls.visit_all(v)
        end
 end
 redef class AExternCall
@@ -7312,14 +8233,14 @@ redef class AQualified
                n_classid: nullable TClassid
        )
        do
-               _n_id.unsafe_add_all(n_id)
+               self.n_id.unsafe_add_all(n_id)
                _n_classid = n_classid
                if n_classid != null then n_classid.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_id.replace_child(old_child, new_child) then return
+               if n_id.replace_child(old_child, new_child) then return
                if _n_classid == old_child then
                        n_classid = new_child.as(nullable TClassid)
                        return
@@ -7335,7 +8256,7 @@ redef class AQualified
 
        redef fun visit_all(v: Visitor)
        do
-               _n_id.visit_all(v)
+               n_id.visit_all(v)
                v.enter_visit(_n_classid)
        end
 end
@@ -7344,40 +8265,50 @@ redef class ADoc
                n_comment: Collection[Object] # Should be Collection[TComment]
        )
        do
-               _n_comment.unsafe_add_all(n_comment)
+               self.n_comment.unsafe_add_all(n_comment)
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
-               if _n_comment.replace_child(old_child, new_child) then return
+               if n_comment.replace_child(old_child, new_child) then return
        end
 
 
 
        redef fun visit_all(v: Visitor)
        do
-               _n_comment.visit_all(v)
+               n_comment.visit_all(v)
        end
 end
 redef class AAnnotations
        init init_aannotations (
+               n_kwis: nullable TKwis,
                n_at: nullable TAt,
                n_opar: nullable TOpar,
                n_items: Collection[Object], # Should be Collection[AAnnotation]
-               n_cpar: nullable TCpar
+               n_cpar: nullable TCpar,
+               n_kwend: nullable TKwend
        )
        do
+               _n_kwis = n_kwis
+               if n_kwis != null then n_kwis.parent = self
                _n_at = n_at
                if n_at != null then n_at.parent = self
                _n_opar = n_opar
                if n_opar != null then n_opar.parent = self
-               _n_items.unsafe_add_all(n_items)
+               self.n_items.unsafe_add_all(n_items)
                _n_cpar = n_cpar
                if n_cpar != null then n_cpar.parent = self
+               _n_kwend = n_kwend
+               if n_kwend != null then n_kwend.parent = self
        end
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
+               if _n_kwis == old_child then
+                       n_kwis = new_child.as(nullable TKwis)
+                       return
+               end
                if _n_at == old_child then
                        n_at = new_child.as(nullable TAt)
                        return
@@ -7386,13 +8317,22 @@ redef class AAnnotations
                        n_opar = new_child.as(nullable TOpar)
                        return
                end
-               if _n_items.replace_child(old_child, new_child) then return
+               if n_items.replace_child(old_child, new_child) then return
                if _n_cpar == old_child then
                        n_cpar = new_child.as(nullable TCpar)
                        return
                end
+               if _n_kwend == old_child then
+                       n_kwend = new_child.as(nullable TKwend)
+                       return
+               end
        end
 
+       redef fun n_kwis=(node)
+       do
+               _n_kwis = node
+               if node != null then node.parent = self
+       end
        redef fun n_at=(node)
        do
                _n_at = node
@@ -7408,30 +8348,46 @@ redef class AAnnotations
                _n_cpar = node
                if node != null then node.parent = self
        end
+       redef fun n_kwend=(node)
+       do
+               _n_kwend = node
+               if node != null then node.parent = self
+       end
 
 
        redef fun visit_all(v: Visitor)
        do
+               v.enter_visit(_n_kwis)
                v.enter_visit(_n_at)
                v.enter_visit(_n_opar)
-               _n_items.visit_all(v)
+               n_items.visit_all(v)
                v.enter_visit(_n_cpar)
+               v.enter_visit(_n_kwend)
        end
 end
 redef class AAnnotation
        init init_aannotation (
+               n_doc: nullable ADoc,
+               n_kwredef: nullable TKwredef,
+               n_visibility: nullable AVisibility,
                n_atid: nullable AAtid,
                n_opar: nullable TOpar,
-               n_args: Collection[Object], # Should be Collection[AAtArg]
+               n_args: Collection[Object], # Should be Collection[AExpr]
                n_cpar: nullable TCpar,
                n_annotations: nullable AAnnotations
        )
        do
+               _n_doc = n_doc
+               if n_doc != null then n_doc.parent = self
+               _n_kwredef = n_kwredef
+               if n_kwredef != null then n_kwredef.parent = self
+               _n_visibility = n_visibility
+               if n_visibility != null then n_visibility.parent = self
                _n_atid = n_atid.as(not null)
                n_atid.parent = self
                _n_opar = n_opar
                if n_opar != null then n_opar.parent = self
-               _n_args.unsafe_add_all(n_args)
+               self.n_args.unsafe_add_all(n_args)
                _n_cpar = n_cpar
                if n_cpar != null then n_cpar.parent = self
                _n_annotations = n_annotations
@@ -7440,6 +8396,18 @@ redef class AAnnotation
 
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
+               if _n_doc == old_child then
+                       n_doc = new_child.as(nullable ADoc)
+                       return
+               end
+               if _n_kwredef == old_child then
+                       n_kwredef = new_child.as(nullable TKwredef)
+                       return
+               end
+               if _n_visibility == old_child then
+                       n_visibility = new_child.as(nullable AVisibility)
+                       return
+               end
                if _n_atid == old_child then
                        n_atid = new_child.as(AAtid)
                        return
@@ -7448,7 +8416,7 @@ redef class AAnnotation
                        n_opar = new_child.as(nullable TOpar)
                        return
                end
-               if _n_args.replace_child(old_child, new_child) then return
+               if n_args.replace_child(old_child, new_child) then return
                if _n_cpar == old_child then
                        n_cpar = new_child.as(nullable TCpar)
                        return
@@ -7459,6 +8427,21 @@ redef class AAnnotation
                end
        end
 
+       redef fun n_doc=(node)
+       do
+               _n_doc = node
+               if node != null then node.parent = self
+       end
+       redef fun n_kwredef=(node)
+       do
+               _n_kwredef = node
+               if node != null then node.parent = self
+       end
+       redef fun n_visibility=(node)
+       do
+               _n_visibility = node
+               if node != null then node.parent = self
+       end
        redef fun n_atid=(node)
        do
                _n_atid = node
@@ -7483,100 +8466,16 @@ redef class AAnnotation
 
        redef fun visit_all(v: Visitor)
        do
+               v.enter_visit(_n_doc)
+               v.enter_visit(_n_kwredef)
+               v.enter_visit(_n_visibility)
                v.enter_visit(_n_atid)
                v.enter_visit(_n_opar)
-               _n_args.visit_all(v)
+               n_args.visit_all(v)
                v.enter_visit(_n_cpar)
                v.enter_visit(_n_annotations)
        end
 end
-redef class ATypeAtArg
-       init init_atypeatarg (
-               n_type: nullable AType
-       )
-       do
-               _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
-                       n_type = new_child.as(AType)
-                       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 AExprAtArg
-       init init_aexpratarg (
-               n_expr: nullable AExpr
-       )
-       do
-               _n_expr = n_expr.as(not null)
-               n_expr.parent = self
-       end
-
-       redef fun replace_child(old_child: ANode, new_child: nullable ANode)
-       do
-               if _n_expr == old_child then
-                       n_expr = new_child.as(AExpr)
-                       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_expr)
-       end
-end
-redef class AAtAtArg
-       init init_aatatarg (
-               n_annotations: nullable AAnnotations
-       )
-       do
-               _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_annotations == old_child then
-                       n_annotations = new_child.as(AAnnotations)
-                       return
-               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_annotations)
-       end
-end
 redef class AIdAtid
        init init_aidatid (
                n_id: nullable TId
@@ -7635,67 +8534,9 @@ redef class AKwexternAtid
                v.enter_visit(_n_id)
        end
 end
-redef class AKwinternAtid
-       init init_akwinternatid (
-               n_id: nullable TKwintern
-       )
-       do
-               _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_id == old_child then
-                       n_id = new_child.as(TKwintern)
-                       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_id)
-       end
-end
-redef class AKwreadableAtid
-       init init_akwreadableatid (
-               n_id: nullable TKwreadable
-       )
-       do
-               _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_id == old_child then
-                       n_id = new_child.as(TKwreadable)
-                       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_id)
-       end
-end
-redef class AKwwritableAtid
-       init init_akwwritableatid (
-               n_id: nullable TKwwritable
+redef class AKwabstractAtid
+       init init_akwabstractatid (
+               n_id: nullable TKwabstract
        )
        do
                _n_id = n_id.as(not null)
@@ -7705,7 +8546,7 @@ redef class AKwwritableAtid
        redef fun replace_child(old_child: ANode, new_child: nullable ANode)
        do
                if _n_id == old_child then
-                       n_id = new_child.as(TKwwritable)
+                       n_id = new_child.as(TKwabstract)
                        return
                end
        end