X-Git-Url: http://nitlanguage.org diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit index dd9b34e..655a8ab 100644 --- a/src/parser/parser_prod.nit +++ b/src/parser/parser_prod.nit @@ -1,25 +1,26 @@ # Production AST nodes full definition. -# This file was generated by SableCC (http://www.sablecc.org/). +# This file was generated by SableCC (http://www.sablecc.org/). package parser_prod import lexer intrude import parser_nodes +private import tables -redef class PNode +redef class ANode # Parent of the node in the AST - readable writable attr _parent: PNode + readable writable var _parent: nullable ANode # Remove a child from the AST - meth remove_child(child: PNode) + fun remove_child(child: ANode) do replace_child(child, null) end # Replace a child with an other node in the AST - meth replace_child(old_child: PNode, new_child: PNode) is abstract + fun replace_child(old_child: ANode, new_child: nullable ANode) is abstract # Replace itself with an other node in the AST - meth replace_with(node: PNode) + fun replace_with(node: ANode) do if (_parent != null) then _parent.replace_child(self, node) @@ -28,122 +29,86 @@ redef class PNode # Visit all nodes in order. # Thus, call "v.visit(e)" for each node e - meth visit_all(v: Visitor) is abstract - - # Visit all nodes in reverse order. - # Thus, call "v.visit(e)" for each node e starting from the last child - meth visit_all_reverse(v: Visitor) is abstract - - # Give a human readable location of the node. - meth locate: String is abstract - - # Debug method: output a message prefixed with the location. - meth printl(str: String) - do - print("{locate}: {str}\n") - end + fun visit_all(v: Visitor) is abstract end redef class Token - redef meth visit_all(v: Visitor) do end - redef meth visit_all_reverse(v: Visitor) do end - redef meth replace_child(old_child: PNode, new_child: PNode) do end - - redef meth locate: String - do - return "{filename}:{line},{pos}" - end + redef fun visit_all(v: Visitor) do end + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do end end redef class Prod - # The first token of the production node - readable writable attr _first_token: Token - - # The last token of the production node - readable writable attr _last_token: Token - - redef meth locate: String - do - if first_token == null then - return "????" - end - var lastpos = last_token.pos + last_token.text.length - 1 - if first_token.line == last_token.line then - return "{first_token.locate}--{lastpos}" - else - return "{first_token.locate}--{last_token.line}:{lastpos}" - end - end - - redef meth replace_with(n: PNode) - do - super - assert n isa Prod - n.first_token = first_token - n.last_token = last_token - end + redef fun replace_with(n: ANode) + do + super + assert n isa Prod + n.location = location + end end # Abstract standard visitor class Visitor + # What the visitor do when a node is visited + # Concrete visitors should redefine this method. + protected fun visit(e: nullable ANode) is abstract + # Ask the visitor to visit a given node. # Usually automatically called by visit_all* methods. - # Concrete visitors should redefine this method. - meth visit(e: PNode) is abstract + # This methos should not be redefined + fun enter_visit(e: nullable ANode) + do + var old = _current_node + _current_node = e + visit(e) + _current_node = old + end + + # The current visited node + readable var _current_node: nullable ANode = null end redef class AModule - redef meth n_packagedecl=(n: PPackagedecl) - do - _n_packagedecl = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_amodule ( - n_packagedecl: PPackagedecl , - n_imports: Array[Object] , # Should be Array[PImport] - n_classdefs: Array[Object] # Should be Array[PClassdef] + n_moduledecl: nullable AModuledecl, + n_imports: Collection[Object], # Should be Collection[AImport] + n_classdefs: Collection[Object] # Should be Collection[AClassdef] ) do - _n_packagedecl = n_packagedecl - if n_packagedecl != null then - n_packagedecl.parent = self + empty_init + _n_moduledecl = n_moduledecl + if n_moduledecl != null then + n_moduledecl.parent = self end - _n_imports = new List[PImport] for n in n_imports do - assert n isa PImport + assert n isa AImport _n_imports.add(n) n.parent = self end - _n_classdefs = new List[PClassdef] for n in n_classdefs do - assert n isa PClassdef + assert n isa AClassdef _n_classdefs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null - if _n_packagedecl == old_child then + if _n_moduledecl == old_child then if new_child != null then new_child.parent = self - assert new_child isa PPackagedecl - _n_packagedecl = new_child + assert new_child isa AModuledecl + _n_moduledecl = new_child else - _n_packagedecl = null + _n_moduledecl = null end return end for i in [0.._n_imports.length[ do if _n_imports[i] == old_child then if new_child != null then - assert new_child isa PImport + assert new_child isa AImport _n_imports[i] = new_child new_child.parent = self else @@ -155,7 +120,7 @@ redef class AModule for i in [0.._n_classdefs.length[ do if _n_classdefs[i] == old_child then if new_child != null then - assert new_child isa PClassdef + assert new_child isa AClassdef _n_classdefs[i] = new_child new_child.parent = self else @@ -166,105 +131,58 @@ redef class AModule end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_packagedecl != null then - v.visit(_n_packagedecl) + if _n_moduledecl != null then + v.enter_visit(_n_moduledecl.as(not null)) end for n in _n_imports do - v.visit(n) + v.enter_visit(n) end for n in _n_classdefs do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_packagedecl != null then - v.visit(_n_packagedecl) - end - do - var i = _n_imports.length - while i >= 0 do - v.visit(_n_imports[i]) - i = i - 1 - end - end - do - var i = _n_classdefs.length - while i >= 0 do - v.visit(_n_classdefs[i]) - i = i - 1 + v.enter_visit(n) end - end end end -redef class APackagedecl - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwpackage=(n: TKwpackage) - do - _n_kwpackage = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - +redef class AModuledecl private init empty_init do end - init init_apackagedecl ( - n_doc: PDoc , - n_kwpackage: TKwpackage , - n_id: TId + init init_amoduledecl ( + n_doc: nullable ADoc, + n_kwmodule: nullable TKwmodule, + n_id: nullable TId ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self end - _n_kwpackage = n_kwpackage - if n_kwpackage != null then - n_kwpackage.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end + _n_kwmodule = n_kwmodule.as(not null) + n_kwmodule.parent = self + _n_id = n_id.as(not null) + n_id.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null end return end - if _n_kwpackage == old_child then + if _n_kwmodule == old_child then if new_child != null then new_child.parent = self - assert new_child isa TKwpackage - _n_kwpackage = new_child + assert new_child isa TKwmodule + _n_kwmodule = new_child else - _n_kwpackage = null + abort end return end @@ -274,93 +192,48 @@ redef class APackagedecl assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwpackage != null then - v.visit(_n_kwpackage) - end - if _n_id != null then - v.visit(_n_id) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwpackage != null then - v.visit(_n_kwpackage) - end - if _n_id != null then - v.visit(_n_id) + v.enter_visit(_n_doc.as(not null)) end + v.enter_visit(_n_kwmodule) + v.enter_visit(_n_id) end end -redef class AImport - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwimport=(n: TKwimport) - do - _n_kwimport = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - +redef class AStdImport private init empty_init do end - init init_aimport ( - n_visibility: PVisibility , - n_kwimport: TKwimport , - n_id: TId + init init_astdimport ( + n_visibility: nullable AVisibility, + n_kwimport: nullable TKwimport, + n_id: nullable TId ) do - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwimport = n_kwimport - if n_kwimport != null then - n_kwimport.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_visibility = n_visibility.as(not null) + n_visibility.parent = self + _n_kwimport = n_kwimport.as(not null) + n_kwimport.parent = self + _n_id = n_id.as(not null) + n_id.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -370,7 +243,7 @@ redef class AImport assert new_child isa TKwimport _n_kwimport = new_child else - _n_kwimport = null + abort end return end @@ -380,93 +253,46 @@ redef class AImport assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwimport != null then - v.visit(_n_kwimport) - end - if _n_id != null then - v.visit(_n_id) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwimport != null then - v.visit(_n_kwimport) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwimport) + v.enter_visit(_n_id) end end redef class ANoImport - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwimport=(n: TKwimport) - do - _n_kwimport = n - if n != null then - n.parent = self - end - end - redef meth n_kwend=(n: TKwend) - do - _n_kwend = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_anoimport ( - n_visibility: PVisibility , - n_kwimport: TKwimport , - n_kwend: TKwend + n_visibility: nullable AVisibility, + n_kwimport: nullable TKwimport, + n_kwend: nullable TKwend ) do - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwimport = n_kwimport - if n_kwimport != null then - n_kwimport.parent = self - end - _n_kwend = n_kwend - if n_kwend != null then - n_kwend.parent = self - end + empty_init + _n_visibility = n_visibility.as(not null) + n_visibility.parent = self + _n_kwimport = n_kwimport.as(not null) + n_kwimport.parent = self + _n_kwend = n_kwend.as(not null) + n_kwend.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -476,7 +302,7 @@ redef class ANoImport assert new_child isa TKwimport _n_kwimport = new_child else - _n_kwimport = null + abort end return end @@ -486,259 +312,143 @@ redef class ANoImport assert new_child isa TKwend _n_kwend = new_child else - _n_kwend = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwimport != null then - v.visit(_n_kwimport) - end - if _n_kwend != null then - v.visit(_n_kwend) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwimport != null then - v.visit(_n_kwimport) - end - if _n_kwend != null then - v.visit(_n_kwend) - end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwimport) + v.enter_visit(_n_kwend) end end redef class APublicVisibility - private init empty_init do end init init_apublicvisibility do + empty_init end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null end - redef meth visit_all(v: Visitor) - do - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do end end redef class APrivateVisibility - redef meth n_kwprivate=(n: TKwprivate) - do - _n_kwprivate = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aprivatevisibility ( - n_kwprivate: TKwprivate + n_kwprivate: nullable TKwprivate ) do - _n_kwprivate = n_kwprivate - if n_kwprivate != null then - n_kwprivate.parent = self - end + empty_init + _n_kwprivate = n_kwprivate.as(not null) + n_kwprivate.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwprivate == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwprivate _n_kwprivate = new_child else - _n_kwprivate = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwprivate != null then - v.visit(_n_kwprivate) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwprivate != null then - v.visit(_n_kwprivate) - end + v.enter_visit(_n_kwprivate) end end redef class AProtectedVisibility - redef meth n_kwprotected=(n: TKwprotected) - do - _n_kwprotected = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aprotectedvisibility ( - n_kwprotected: TKwprotected + n_kwprotected: nullable TKwprotected ) do - _n_kwprotected = n_kwprotected - if n_kwprotected != null then - n_kwprotected.parent = self - end + empty_init + _n_kwprotected = n_kwprotected.as(not null) + n_kwprotected.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwprotected == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwprotected _n_kwprotected = new_child else - _n_kwprotected = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwprotected != null then - v.visit(_n_kwprotected) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwprotected != null then - v.visit(_n_kwprotected) - end + v.enter_visit(_n_kwprotected) end end redef class AIntrudeVisibility - redef meth n_kwintrude=(n: TKwintrude) - do - _n_kwintrude = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aintrudevisibility ( - n_kwintrude: TKwintrude + n_kwintrude: nullable TKwintrude ) do - _n_kwintrude = n_kwintrude - if n_kwintrude != null then - n_kwintrude.parent = self - end + empty_init + _n_kwintrude = n_kwintrude.as(not null) + n_kwintrude.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwintrude == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwintrude _n_kwintrude = new_child else - _n_kwintrude = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwintrude != null then - v.visit(_n_kwintrude) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwintrude != null then - v.visit(_n_kwintrude) - end + v.enter_visit(_n_kwintrude) end end -redef class AClassdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_classkind=(n: PClasskind) - do - _n_classkind = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TClassid) - do - _n_id = n - if n != null then - n.parent = self - end - end - +redef class AStdClassdef private init empty_init do end - init init_aclassdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_classkind: PClasskind , - n_id: TClassid , - n_formaldefs: Array[Object] , # Should be Array[PFormaldef] - n_superclasses: Array[Object] , # Should be Array[PSuperclass] - n_propdefs: Array[Object] # Should be Array[PPropdef] + init init_astdclassdef ( + n_doc: nullable ADoc, + n_kwredef: nullable TKwredef, + n_visibility: nullable AVisibility, + n_classkind: nullable AClasskind, + n_id: nullable TClassid, + n_formaldefs: Collection[Object], # Should be Collection[AFormaldef] + n_superclasses: Collection[Object], # Should be Collection[ASuperclass] + n_propdefs: Collection[Object] # Should be Collection[APropdef] ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -747,45 +457,37 @@ redef class AClassdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_classkind = n_classkind - if n_classkind != null then - n_classkind.parent = self - end + _n_visibility = n_visibility.as(not null) + n_visibility.parent = self + _n_classkind = n_classkind.as(not null) + n_classkind.parent = self _n_id = n_id if n_id != null then n_id.parent = self end - _n_formaldefs = new List[PFormaldef] for n in n_formaldefs do - assert n isa PFormaldef + assert n isa AFormaldef _n_formaldefs.add(n) n.parent = self end - _n_superclasses = new List[PSuperclass] for n in n_superclasses do - assert n isa PSuperclass + assert n isa ASuperclass _n_superclasses.add(n) n.parent = self end - _n_propdefs = new List[PPropdef] for n in n_propdefs do - assert n isa PPropdef + assert n isa APropdef _n_propdefs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -805,20 +507,20 @@ redef class AClassdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end if _n_classkind == old_child then if new_child != null then new_child.parent = self - assert new_child isa PClasskind + assert new_child isa AClasskind _n_classkind = new_child else - _n_classkind = null + abort end return end @@ -835,7 +537,7 @@ redef class AClassdef for i in [0.._n_formaldefs.length[ do if _n_formaldefs[i] == old_child then if new_child != null then - assert new_child isa PFormaldef + assert new_child isa AFormaldef _n_formaldefs[i] = new_child new_child.parent = self else @@ -847,7 +549,7 @@ redef class AClassdef for i in [0.._n_superclasses.length[ do if _n_superclasses[i] == old_child then if new_child != null then - assert new_child isa PSuperclass + assert new_child isa ASuperclass _n_superclasses[i] = new_child new_child.parent = self else @@ -859,7 +561,7 @@ redef class AClassdef for i in [0.._n_propdefs.length[ do if _n_propdefs[i] == old_child then if new_child != null then - assert new_child isa PPropdef + assert new_child isa APropdef _n_propdefs[i] = new_child new_child.parent = self else @@ -870,97 +572,51 @@ redef class AClassdef end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_classkind != null then - v.visit(_n_classkind) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_classkind) if _n_id != null then - v.visit(_n_id) + v.enter_visit(_n_id.as(not null)) end for n in _n_formaldefs do - v.visit(n) + v.enter_visit(n) end for n in _n_superclasses do - v.visit(n) + v.enter_visit(n) end for n in _n_propdefs do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_classkind != null then - v.visit(_n_classkind) - end - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_formaldefs.length - while i >= 0 do - v.visit(_n_formaldefs[i]) - i = i - 1 + v.enter_visit(n) end - end - do - var i = _n_superclasses.length - while i >= 0 do - v.visit(_n_superclasses[i]) - i = i - 1 - end - end - do - var i = _n_propdefs.length - while i >= 0 do - v.visit(_n_propdefs[i]) - i = i - 1 - end - end end end redef class ATopClassdef - private init empty_init do end init init_atopclassdef ( - n_propdefs: Array[Object] # Should be Array[PPropdef] + n_propdefs: Collection[Object] # Should be Collection[APropdef] ) do - _n_propdefs = new List[PPropdef] + empty_init for n in n_propdefs do - assert n isa PPropdef + assert n isa APropdef _n_propdefs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_propdefs.length[ do if _n_propdefs[i] == old_child then if new_child != null then - assert new_child isa PPropdef + assert new_child isa APropdef _n_propdefs[i] = new_child new_child.parent = self else @@ -971,47 +627,34 @@ redef class ATopClassdef end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_propdefs do - v.visit(n) + v.enter_visit(n) end end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_propdefs.length - while i >= 0 do - v.visit(_n_propdefs[i]) - i = i - 1 - end - end - end end redef class AMainClassdef - private init empty_init do end init init_amainclassdef ( - n_propdefs: Array[Object] # Should be Array[PPropdef] + n_propdefs: Collection[Object] # Should be Collection[APropdef] ) do - _n_propdefs = new List[PPropdef] + empty_init for n in n_propdefs do - assert n isa PPropdef + assert n isa APropdef _n_propdefs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_propdefs.length[ do if _n_propdefs[i] == old_child then if new_child != null then - assert new_child isa PPropdef + assert new_child isa APropdef _n_propdefs[i] = new_child new_child.parent = self else @@ -1022,117 +665,68 @@ redef class AMainClassdef end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_propdefs do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_propdefs.length - while i >= 0 do - v.visit(_n_propdefs[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class AConcreteClasskind - redef meth n_kwclass=(n: TKwclass) - do - _n_kwclass = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aconcreteclasskind ( - n_kwclass: TKwclass + n_kwclass: nullable TKwclass ) do - _n_kwclass = n_kwclass - if n_kwclass != null then - n_kwclass.parent = self - end + empty_init + _n_kwclass = n_kwclass.as(not null) + n_kwclass.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwclass == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwclass _n_kwclass = new_child else - _n_kwclass = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwclass != null then - v.visit(_n_kwclass) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwclass != null then - v.visit(_n_kwclass) - end + v.enter_visit(_n_kwclass) end end redef class AAbstractClasskind - redef meth n_kwabstract=(n: TKwabstract) - do - _n_kwabstract = n - if n != null then - n.parent = self - end - end - redef meth n_kwclass=(n: TKwclass) - do - _n_kwclass = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aabstractclasskind ( - n_kwabstract: TKwabstract , - n_kwclass: TKwclass + n_kwabstract: nullable TKwabstract, + n_kwclass: nullable TKwclass ) do - _n_kwabstract = n_kwabstract - if n_kwabstract != null then - n_kwabstract.parent = self - end - _n_kwclass = n_kwclass - if n_kwclass != null then - n_kwclass.parent = self - end + empty_init + _n_kwabstract = n_kwabstract.as(not null) + n_kwabstract.parent = self + _n_kwclass = n_kwclass.as(not null) + n_kwclass.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwabstract == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwabstract _n_kwabstract = new_child else - _n_kwabstract = null + abort end return end @@ -1142,182 +736,113 @@ redef class AAbstractClasskind assert new_child isa TKwclass _n_kwclass = new_child else - _n_kwclass = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwabstract != null then - v.visit(_n_kwabstract) - end - if _n_kwclass != null then - v.visit(_n_kwclass) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwabstract != null then - v.visit(_n_kwabstract) - end - if _n_kwclass != null then - v.visit(_n_kwclass) - end + v.enter_visit(_n_kwabstract) + v.enter_visit(_n_kwclass) end end redef class AInterfaceClasskind - redef meth n_kwinterface=(n: TKwinterface) - do - _n_kwinterface = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_ainterfaceclasskind ( - n_kwinterface: TKwinterface + n_kwinterface: nullable TKwinterface ) do - _n_kwinterface = n_kwinterface - if n_kwinterface != null then - n_kwinterface.parent = self - end + empty_init + _n_kwinterface = n_kwinterface.as(not null) + n_kwinterface.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwinterface == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwinterface _n_kwinterface = new_child else - _n_kwinterface = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwinterface != null then - v.visit(_n_kwinterface) - end + v.enter_visit(_n_kwinterface) end +end +redef class AEnumClasskind + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aenumclasskind ( + n_kwenum: nullable TKwenum + ) do - if _n_kwinterface != null then - v.visit(_n_kwinterface) - end - end -end -redef class AUniversalClasskind - redef meth n_kwuniversal=(n: TKwuniversal) - do - _n_kwuniversal = n - if n != null then - n.parent = self - end - end - - private init empty_init do end - - init init_auniversalclasskind ( - n_kwuniversal: TKwuniversal - ) - do - _n_kwuniversal = n_kwuniversal - if n_kwuniversal != null then - n_kwuniversal.parent = self - end + empty_init + _n_kwenum = n_kwenum.as(not null) + n_kwenum.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null - if _n_kwuniversal == old_child then + if _n_kwenum == old_child then if new_child != null then new_child.parent = self - assert new_child isa TKwuniversal - _n_kwuniversal = new_child + assert new_child isa TKwenum + _n_kwenum = new_child else - _n_kwuniversal = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwuniversal != null then - v.visit(_n_kwuniversal) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwuniversal != null then - v.visit(_n_kwuniversal) - end + v.enter_visit(_n_kwenum) end end redef class AFormaldef - redef meth n_id=(n: TClassid) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aformaldef ( - n_id: TClassid , - n_type: PType + n_id: nullable TClassid, + n_type: nullable AType ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self _n_type = n_type if n_type != null then n_type.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TClassid _n_id = new_child else - _n_id = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else _n_type = null @@ -1326,62 +851,38 @@ redef class AFormaldef end end - redef meth visit_all(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_id) if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_type.as(not null)) end end end redef class ASuperclass - redef meth n_kwspecial=(n: TKwspecial) - do - _n_kwspecial = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_asuperclass ( - n_kwspecial: TKwspecial , - n_type: PType + n_kwspecial: nullable TKwspecial, + n_kwsuper: nullable TKwsuper, + n_type: nullable AType ) do + empty_init _n_kwspecial = n_kwspecial if n_kwspecial != null then n_kwspecial.parent = self end - _n_type = n_type - if n_type != null then - n_type.parent = self + _n_kwsuper = n_kwsuper + if n_kwsuper != null then + n_kwsuper.parent = self end + _n_type = n_type.as(not null) + n_type.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwspecial == old_child then if new_child != null then new_child.parent = self @@ -1392,117 +893,56 @@ redef class ASuperclass end return end + if _n_kwsuper == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwsuper + _n_kwsuper = new_child + else + _n_kwsuper = null + end + return + end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else - _n_type = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwspecial != null then - v.visit(_n_kwspecial) - end - if _n_type != null then - v.visit(_n_type) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwspecial != null then - v.visit(_n_kwspecial) + v.enter_visit(_n_kwspecial.as(not null)) end - if _n_type != null then - v.visit(_n_type) + if _n_kwsuper != null then + v.enter_visit(_n_kwsuper.as(not null)) end + v.enter_visit(_n_type) end end redef class AAttrPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_readable=(n: PAble) - do - _n_readable = n - if n != null then - n.parent = self - end - end - redef meth n_writable=(n: PAble) - do - _n_writable = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwattr=(n: TKwattr) - do - _n_kwattr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TAttrid) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aattrpropdef ( - n_doc: PDoc , - n_readable: PAble , - n_writable: PAble , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwattr: TKwattr , - n_id: TAttrid , - n_type: PType , - n_expr: PExpr + 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_expr: nullable AExpr ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -1519,18 +959,18 @@ redef class AAttrPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwattr = n_kwattr - if n_kwattr != null then - n_kwattr.parent = self - end + _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 end + _n_id2 = n_id2 + if n_id2 != null then + n_id2.parent = self + end _n_type = n_type if n_type != null then n_type.parent = self @@ -1541,13 +981,12 @@ redef class AAttrPropdef end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -1557,7 +996,7 @@ redef class AAttrPropdef if _n_readable == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAble + assert new_child isa AAble _n_readable = new_child else _n_readable = null @@ -1567,7 +1006,7 @@ redef class AAttrPropdef if _n_writable == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAble + assert new_child isa AAble _n_writable = new_child else _n_writable = null @@ -1587,20 +1026,20 @@ redef class AAttrPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end - if _n_kwattr == old_child then + if _n_kwvar == old_child then if new_child != null then new_child.parent = self - assert new_child isa TKwattr - _n_kwattr = new_child + assert new_child isa TKwvar + _n_kwvar = new_child else - _n_kwattr = null + abort end return end @@ -1614,10 +1053,20 @@ redef class AAttrPropdef end return end + if _n_id2 == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TId + _n_id2 = new_child + else + _n_id2 = null + end + return + end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else _n_type = null @@ -1627,7 +1076,7 @@ redef class AAttrPropdef if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else _n_expr = null @@ -1636,115 +1085,48 @@ redef class AAttrPropdef end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_readable != null then - v.visit(_n_readable) + v.enter_visit(_n_readable.as(not null)) end if _n_writable != null then - v.visit(_n_writable) + v.enter_visit(_n_writable.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwattr != null then - v.visit(_n_kwattr) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwvar) if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_id.as(not null)) end - if _n_readable != null then - v.visit(_n_readable) - end - if _n_writable != null then - v.visit(_n_writable) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwattr != null then - v.visit(_n_kwattr) - end - if _n_id != null then - v.visit(_n_id) + if _n_id2 != null then + v.enter_visit(_n_id2.as(not null)) end if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_type.as(not null)) end if _n_expr != null then - v.visit(_n_expr) + v.enter_visit(_n_expr.as(not null)) end end end redef class AMethPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_amethpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_methid: PMethid , - n_signature: PSignature + n_doc: nullable ADoc, + n_kwredef: nullable TKwredef, + n_visibility: nullable AVisibility, + n_methid: nullable AMethid, + n_signature: nullable ASignature ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -1753,27 +1135,20 @@ redef class AMethPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_methid = n_methid - if n_methid != null then - n_methid.parent = self - end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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 end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -1793,128 +1168,61 @@ redef class AMethPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else - _n_methid = null + abort end return end if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_methid) + v.enter_visit(_n_signature) end end redef class ADeferredMethPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwmeth=(n: TKwmeth) - do - _n_kwmeth = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_adeferredmethpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwmeth: TKwmeth , - n_methid: PMethid , - n_signature: PSignature + 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 + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -1923,31 +1231,22 @@ redef class ADeferredMethPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwmeth = n_kwmeth - if n_kwmeth != null then - n_kwmeth.parent = self - end - _n_methid = n_methid - if n_methid != null then - n_methid.parent = self - end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -1967,10 +1266,10 @@ redef class ADeferredMethPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -1980,131 +1279,59 @@ redef class ADeferredMethPropdef assert new_child isa TKwmeth _n_kwmeth = new_child else - _n_kwmeth = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else - _n_methid = null + abort end return end if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwmeth) + v.enter_visit(_n_methid) + v.enter_visit(_n_signature) end end redef class AInternMethPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwmeth=(n: TKwmeth) - do - _n_kwmeth = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_ainternmethpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwmeth: TKwmeth , - n_methid: PMethid , - n_signature: PSignature + 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 + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -2113,31 +1340,22 @@ redef class AInternMethPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwmeth = n_kwmeth - if n_kwmeth != null then - n_kwmeth.parent = self - end - _n_methid = n_methid - if n_methid != null then - n_methid.parent = self - end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -2157,10 +1375,10 @@ redef class AInternMethPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -2170,139 +1388,60 @@ redef class AInternMethPropdef assert new_child isa TKwmeth _n_kwmeth = new_child else - _n_kwmeth = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else - _n_methid = null + abort end return end if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_kwredef.as(not null)) end + 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 - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwmeth=(n: TKwmeth) - do - _n_kwmeth = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - redef meth n_extern=(n: TString) - do - _n_extern = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aexternmethpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwmeth: TKwmeth , - n_methid: PMethid , - n_signature: PSignature , - n_extern: TString + 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_extern: nullable TString ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -2311,35 +1450,26 @@ redef class AExternMethPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwmeth = n_kwmeth - if n_kwmeth != null then - n_kwmeth.parent = self - end - _n_methid = n_methid - if n_methid != null then - n_methid.parent = self - end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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_extern = n_extern if n_extern != null then n_extern.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -2359,10 +1489,10 @@ redef class AExternMethPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -2372,27 +1502,27 @@ redef class AExternMethPropdef assert new_child isa TKwmeth _n_kwmeth = new_child else - _n_kwmeth = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else - _n_methid = null + abort end return end if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end @@ -2408,119 +1538,37 @@ redef class AExternMethPropdef end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - if _n_extern != null then - v.visit(_n_extern) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwmeth) + v.enter_visit(_n_methid) + v.enter_visit(_n_signature) if _n_extern != null then - v.visit(_n_extern) + v.enter_visit(_n_extern.as(not null)) end end end redef class AConcreteMethPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwmeth=(n: TKwmeth) - do - _n_kwmeth = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aconcretemethpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwmeth: TKwmeth , - n_methid: PMethid , - n_signature: PSignature , - n_block: PExpr + 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_block: nullable AExpr ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -2529,35 +1577,26 @@ redef class AConcreteMethPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwmeth = n_kwmeth - if n_kwmeth != null then - n_kwmeth.parent = self - end - _n_methid = n_methid - if n_methid != null then - n_methid.parent = self - end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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_block = n_block if n_block != null then n_block.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -2577,10 +1616,10 @@ redef class AConcreteMethPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -2590,34 +1629,34 @@ redef class AConcreteMethPropdef assert new_child isa TKwmeth _n_kwmeth = new_child else - _n_kwmeth = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else - _n_methid = null + abort end return end if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_block = new_child else _n_block = null @@ -2626,119 +1665,37 @@ redef class AConcreteMethPropdef end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwmeth != null then - v.visit(_n_kwmeth) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwmeth) + v.enter_visit(_n_methid) + v.enter_visit(_n_signature) if _n_block != null then - v.visit(_n_block) + v.enter_visit(_n_block.as(not null)) end end end redef class AConcreteInitPropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwinit=(n: TKwinit) - do - _n_kwinit = n - if n != null then - n.parent = self - end - end - redef meth n_methid=(n: PMethid) - do - _n_methid = n - if n != null then - n.parent = self - end - end - redef meth n_signature=(n: PSignature) - do - _n_signature = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aconcreteinitpropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwinit: TKwinit , - n_methid: PMethid , - n_signature: PSignature , - n_block: PExpr + 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_block: nullable AExpr ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -2747,35 +1704,28 @@ redef class AConcreteInitPropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwinit = n_kwinit - if n_kwinit != null then - n_kwinit.parent = self - end + _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 end - _n_signature = n_signature - if n_signature != null then - n_signature.parent = self - end + _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 end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -2795,10 +1745,10 @@ redef class AConcreteInitPropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -2808,14 +1758,14 @@ redef class AConcreteInitPropdef assert new_child isa TKwinit _n_kwinit = new_child else - _n_kwinit = null + abort end return end if _n_methid == old_child then if new_child != null then new_child.parent = self - assert new_child isa PMethid + assert new_child isa AMethid _n_methid = new_child else _n_methid = null @@ -2825,17 +1775,17 @@ redef class AConcreteInitPropdef if _n_signature == old_child then if new_child != null then new_child.parent = self - assert new_child isa PSignature + assert new_child isa ASignature _n_signature = new_child else - _n_signature = null + abort end return end if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_block = new_child else _n_block = null @@ -2844,79 +1794,34 @@ redef class AConcreteInitPropdef end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwinit != null then - v.visit(_n_kwinit) - end - if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) - end - if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwinit != null then - v.visit(_n_kwinit) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwinit) if _n_methid != null then - v.visit(_n_methid) - end - if _n_signature != null then - v.visit(_n_signature) + v.enter_visit(_n_methid.as(not null)) end + v.enter_visit(_n_signature) if _n_block != null then - v.visit(_n_block) + v.enter_visit(_n_block.as(not null)) end end end redef class AMainMethPropdef - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_amainmethpropdef ( - n_kwredef: TKwredef , - n_block: PExpr + n_kwredef: nullable TKwredef, + n_block: nullable AExpr ) do + empty_init _n_kwredef = n_kwredef if n_kwredef != null then n_kwredef.parent = self @@ -2927,9 +1832,8 @@ redef class AMainMethPropdef end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwredef == old_child then if new_child != null then new_child.parent = self @@ -2943,7 +1847,7 @@ redef class AMainMethPropdef if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_block = new_child else _n_block = null @@ -2952,81 +1856,29 @@ redef class AMainMethPropdef end end - redef meth visit_all(v: Visitor) - do - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwredef != null then - v.visit(_n_kwredef) + v.enter_visit(_n_kwredef.as(not null)) end if _n_block != null then - v.visit(_n_block) + v.enter_visit(_n_block.as(not null)) end end end redef class ATypePropdef - redef meth n_doc=(n: PDoc) - do - _n_doc = n - if n != null then - n.parent = self - end - end - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_visibility=(n: PVisibility) - do - _n_visibility = n - if n != null then - n.parent = self - end - end - redef meth n_kwtype=(n: TKwtype) - do - _n_kwtype = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TClassid) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_atypepropdef ( - n_doc: PDoc , - n_kwredef: TKwredef , - n_visibility: PVisibility , - n_kwtype: TKwtype , - n_id: TClassid , - n_type: PType + n_doc: nullable ADoc, + n_kwredef: nullable TKwredef, + n_visibility: nullable AVisibility, + n_kwtype: nullable TKwtype, + n_id: nullable TClassid, + n_type: nullable AType ) do + empty_init _n_doc = n_doc if n_doc != null then n_doc.parent = self @@ -3035,31 +1887,22 @@ redef class ATypePropdef if n_kwredef != null then n_kwredef.parent = self end - _n_visibility = n_visibility - if n_visibility != null then - n_visibility.parent = self - end - _n_kwtype = n_kwtype - if n_kwtype != null then - n_kwtype.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_type = n_type - if n_type != null then - n_type.parent = self - end + _n_visibility = n_visibility.as(not null) + n_visibility.parent = self + _n_kwtype = n_kwtype.as(not null) + n_kwtype.parent = self + _n_id = n_id.as(not null) + n_id.parent = self + _n_type = n_type.as(not null) + n_type.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_doc == old_child then if new_child != null then new_child.parent = self - assert new_child isa PDoc + assert new_child isa ADoc _n_doc = new_child else _n_doc = null @@ -3079,10 +1922,10 @@ redef class ATypePropdef if _n_visibility == old_child then if new_child != null then new_child.parent = self - assert new_child isa PVisibility + assert new_child isa AVisibility _n_visibility = new_child else - _n_visibility = null + abort end return end @@ -3092,7 +1935,7 @@ redef class ATypePropdef assert new_child isa TKwtype _n_kwtype = new_child else - _n_kwtype = null + abort end return end @@ -3102,102 +1945,55 @@ redef class ATypePropdef assert new_child isa TClassid _n_id = new_child else - _n_id = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else - _n_type = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_doc != null then - v.visit(_n_doc) - end - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwtype != null then - v.visit(_n_kwtype) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_doc != null then - v.visit(_n_doc) + v.enter_visit(_n_doc.as(not null)) end if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_visibility != null then - v.visit(_n_visibility) - end - if _n_kwtype != null then - v.visit(_n_kwtype) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_visibility) + v.enter_visit(_n_kwtype) + v.enter_visit(_n_id) + v.enter_visit(_n_type) end end redef class AReadAble - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_kwreadable=(n: TKwreadable) - do - _n_kwreadable = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_areadable ( - n_kwredef: TKwredef , - n_kwreadable: TKwreadable + n_kwredef: nullable TKwredef, + n_kwreadable: nullable TKwreadable ) do + empty_init _n_kwredef = n_kwredef if n_kwredef != null then n_kwredef.parent = self end - _n_kwreadable = n_kwreadable - if n_kwreadable != null then - n_kwreadable.parent = self - end + _n_kwreadable = n_kwreadable.as(not null) + n_kwreadable.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwredef == old_child then if new_child != null then new_child.parent = self @@ -3214,68 +2010,44 @@ redef class AReadAble assert new_child isa TKwreadable _n_kwreadable = new_child else - _n_kwreadable = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_kwreadable != null then - v.visit(_n_kwreadable) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_kwreadable != null then - v.visit(_n_kwreadable) + v.enter_visit(_n_kwredef.as(not null)) end + v.enter_visit(_n_kwreadable) end end redef class AWriteAble - redef meth n_kwredef=(n: TKwredef) - do - _n_kwredef = n - if n != null then - n.parent = self - end - end - redef meth n_kwwritable=(n: TKwwritable) - do - _n_kwwritable = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_awriteable ( - n_kwredef: TKwredef , - n_kwwritable: TKwwritable + n_kwredef: nullable TKwredef, + n_visibility: nullable AVisibility, + n_kwwritable: nullable TKwwritable ) do + empty_init _n_kwredef = n_kwredef if n_kwredef != null then n_kwredef.parent = self end - _n_kwwritable = n_kwwritable - if n_kwwritable != null then - n_kwwritable.parent = self + _n_visibility = n_visibility + if n_visibility != null then + n_visibility.parent = self end + _n_kwwritable = n_kwwritable.as(not null) + n_kwwritable.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwredef == old_child then if new_child != null then new_child.parent = self @@ -3286,681 +2058,497 @@ redef class AWriteAble end return end + if _n_visibility == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AVisibility + _n_visibility = new_child + else + _n_visibility = null + end + return + end if _n_kwwritable == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwwritable _n_kwwritable = new_child else - _n_kwwritable = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwredef != null then - v.visit(_n_kwredef) + v.enter_visit(_n_kwredef.as(not null)) end - if _n_kwwritable != null then - v.visit(_n_kwwritable) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwredef != null then - v.visit(_n_kwredef) - end - if _n_kwwritable != null then - v.visit(_n_kwwritable) + if _n_visibility != null then + v.enter_visit(_n_visibility.as(not null)) end + v.enter_visit(_n_kwwritable) end end redef class AIdMethid - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aidmethid ( - n_id: TId + n_id: nullable TId ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_id) end end redef class APlusMethid - redef meth n_plus=(n: TPlus) - do - _n_plus = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aplusmethid ( - n_plus: TPlus + n_plus: nullable TPlus ) do - _n_plus = n_plus - if n_plus != null then - n_plus.parent = self - end + empty_init + _n_plus = n_plus.as(not null) + n_plus.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_plus == old_child then if new_child != null then new_child.parent = self assert new_child isa TPlus _n_plus = new_child else - _n_plus = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_plus != null then - v.visit(_n_plus) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_plus != null then - v.visit(_n_plus) - end + v.enter_visit(_n_plus) end end redef class AMinusMethid - redef meth n_minus=(n: TMinus) - do - _n_minus = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aminusmethid ( - n_minus: TMinus + n_minus: nullable TMinus ) do - _n_minus = n_minus - if n_minus != null then - n_minus.parent = self - end + empty_init + _n_minus = n_minus.as(not null) + n_minus.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_minus == old_child then if new_child != null then new_child.parent = self assert new_child isa TMinus _n_minus = new_child else - _n_minus = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_minus != null then - v.visit(_n_minus) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_minus != null then - v.visit(_n_minus) - end + v.enter_visit(_n_minus) end end redef class AStarMethid - redef meth n_star=(n: TStar) - do - _n_star = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astarmethid ( - n_star: TStar + n_star: nullable TStar ) do - _n_star = n_star - if n_star != null then - n_star.parent = self - end + empty_init + _n_star = n_star.as(not null) + n_star.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_star == old_child then if new_child != null then new_child.parent = self assert new_child isa TStar _n_star = new_child else - _n_star = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_star != null then - v.visit(_n_star) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_star != null then - v.visit(_n_star) - end + v.enter_visit(_n_star) end end redef class ASlashMethid - redef meth n_slash=(n: TSlash) - do - _n_slash = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aslashmethid ( - n_slash: TSlash + n_slash: nullable TSlash ) do - _n_slash = n_slash - if n_slash != null then - n_slash.parent = self - end + empty_init + _n_slash = n_slash.as(not null) + n_slash.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_slash == old_child then if new_child != null then new_child.parent = self assert new_child isa TSlash _n_slash = new_child else - _n_slash = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_slash != null then - v.visit(_n_slash) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_slash != null then - v.visit(_n_slash) - end + v.enter_visit(_n_slash) end end redef class APercentMethid - redef meth n_percent=(n: TPercent) - do - _n_percent = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_apercentmethid ( - n_percent: TPercent + n_percent: nullable TPercent ) do - _n_percent = n_percent - if n_percent != null then - n_percent.parent = self - end + empty_init + _n_percent = n_percent.as(not null) + n_percent.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_percent == old_child then if new_child != null then new_child.parent = self assert new_child isa TPercent _n_percent = new_child else - _n_percent = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_percent != null then - v.visit(_n_percent) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_percent != null then - v.visit(_n_percent) - end + v.enter_visit(_n_percent) end end redef class AEqMethid - redef meth n_eq=(n: TEq) - do - _n_eq = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aeqmethid ( - n_eq: TEq + n_eq: nullable TEq ) do - _n_eq = n_eq - if n_eq != null then - n_eq.parent = self - end + empty_init + _n_eq = n_eq.as(not null) + n_eq.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_eq == old_child then if new_child != null then new_child.parent = self assert new_child isa TEq _n_eq = new_child else - _n_eq = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_eq != null then - v.visit(_n_eq) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_eq != null then - v.visit(_n_eq) - end + v.enter_visit(_n_eq) end end redef class ANeMethid - redef meth n_ne=(n: TNe) - do - _n_ne = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_anemethid ( - n_ne: TNe + n_ne: nullable TNe ) do - _n_ne = n_ne - if n_ne != null then - n_ne.parent = self - end + empty_init + _n_ne = n_ne.as(not null) + n_ne.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_ne == old_child then if new_child != null then new_child.parent = self assert new_child isa TNe _n_ne = new_child else - _n_ne = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_ne != null then - v.visit(_n_ne) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_ne != null then - v.visit(_n_ne) - end + v.enter_visit(_n_ne) end end redef class ALeMethid - redef meth n_le=(n: TLe) - do - _n_le = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_alemethid ( - n_le: TLe + n_le: nullable TLe ) do - _n_le = n_le - if n_le != null then - n_le.parent = self - end + empty_init + _n_le = n_le.as(not null) + n_le.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_le == old_child then if new_child != null then new_child.parent = self assert new_child isa TLe _n_le = new_child else - _n_le = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_le != null then - v.visit(_n_le) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_le != null then - v.visit(_n_le) - end + v.enter_visit(_n_le) end end redef class AGeMethid - redef meth n_ge=(n: TGe) - do - _n_ge = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_agemethid ( - n_ge: TGe + n_ge: nullable TGe ) do - _n_ge = n_ge - if n_ge != null then - n_ge.parent = self - end + empty_init + _n_ge = n_ge.as(not null) + n_ge.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_ge == old_child then if new_child != null then new_child.parent = self assert new_child isa TGe _n_ge = new_child else - _n_ge = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_ge != null then - v.visit(_n_ge) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_ge != null then - v.visit(_n_ge) - end + v.enter_visit(_n_ge) end end redef class ALtMethid - redef meth n_lt=(n: TLt) - do - _n_lt = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_altmethid ( - n_lt: TLt + n_lt: nullable TLt ) do - _n_lt = n_lt - if n_lt != null then - n_lt.parent = self - end + empty_init + _n_lt = n_lt.as(not null) + n_lt.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_lt == old_child then if new_child != null then new_child.parent = self assert new_child isa TLt _n_lt = new_child else - _n_lt = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_lt != null then - v.visit(_n_lt) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_lt != null then - v.visit(_n_lt) - end + v.enter_visit(_n_lt) end end redef class AGtMethid - redef meth n_gt=(n: TGt) - do - _n_gt = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_agtmethid ( - n_gt: TGt + n_gt: nullable TGt ) do - _n_gt = n_gt - if n_gt != null then - n_gt.parent = self - end + empty_init + _n_gt = n_gt.as(not null) + n_gt.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_gt == old_child then if new_child != null then new_child.parent = self assert new_child isa TGt _n_gt = new_child else - _n_gt = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_gt != null then - v.visit(_n_gt) - end + v.enter_visit(_n_gt) + end +end +redef class ALlMethid + private init empty_init do end + + init init_allmethid ( + n_ll: nullable TLl + ) + do + empty_init + _n_ll = n_ll.as(not null) + n_ll.parent = self end - redef meth visit_all_reverse(v: Visitor) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - if _n_gt != null then - v.visit(_n_gt) - end + if _n_ll == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TLl + _n_ll = new_child + else + abort + end + return + end + end + + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_ll) end end -redef class ABraMethid - redef meth n_obra=(n: TObra) +redef class AGgMethid + private init empty_init do end + + init init_aggmethid ( + n_gg: nullable TGg + ) do - _n_obra = n - if n != null then - n.parent = self - end + empty_init + _n_gg = n_gg.as(not null) + n_gg.parent = self end - redef meth n_cbra=(n: TCbra) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_cbra = n - if n != null then - n.parent = self - end + if _n_gg == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TGg + _n_gg = new_child + else + abort + end + return + end end + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_gg) + end +end +redef class ABraMethid private init empty_init do end init init_abramethid ( - n_obra: TObra , - n_cbra: TCbra + n_obra: nullable TObra, + n_cbra: nullable TCbra ) do - _n_obra = n_obra - if n_obra != null then - n_obra.parent = self - end - _n_cbra = n_cbra - if n_cbra != null then - n_cbra.parent = self - end + empty_init + _n_obra = n_obra.as(not null) + n_obra.parent = self + _n_cbra = n_cbra.as(not null) + n_cbra.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_obra == old_child then if new_child != null then new_child.parent = self assert new_child isa TObra _n_obra = new_child else - _n_obra = null + abort end return end @@ -3970,125 +2558,73 @@ redef class ABraMethid assert new_child isa TCbra _n_cbra = new_child else - _n_cbra = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_obra != null then - v.visit(_n_obra) - end - if _n_cbra != null then - v.visit(_n_cbra) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_obra != null then - v.visit(_n_obra) - end - if _n_cbra != null then - v.visit(_n_cbra) - end + v.enter_visit(_n_obra) + v.enter_visit(_n_cbra) end end redef class AStarshipMethid - redef meth n_starship=(n: TStarship) - do - _n_starship = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astarshipmethid ( - n_starship: TStarship + n_starship: nullable TStarship ) do - _n_starship = n_starship - if n_starship != null then - n_starship.parent = self - end + empty_init + _n_starship = n_starship.as(not null) + n_starship.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_starship == old_child then if new_child != null then new_child.parent = self assert new_child isa TStarship _n_starship = new_child else - _n_starship = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_starship != null then - v.visit(_n_starship) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_starship != null then - v.visit(_n_starship) - end + v.enter_visit(_n_starship) end end redef class AAssignMethid - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aassignmethid ( - n_id: TId , - n_assign: TAssign + n_id: nullable TId, + n_assign: nullable TAssign ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self + _n_assign = n_assign.as(not null) + n_assign.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end @@ -4098,87 +2634,45 @@ redef class AAssignMethid assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end + v.enter_visit(_n_id) + v.enter_visit(_n_assign) end end redef class ABraassignMethid - redef meth n_obra=(n: TObra) - do - _n_obra = n - if n != null then - n.parent = self - end - end - redef meth n_cbra=(n: TCbra) - do - _n_cbra = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abraassignmethid ( - n_obra: TObra , - n_cbra: TCbra , - n_assign: TAssign + n_obra: nullable TObra, + n_cbra: nullable TCbra, + n_assign: nullable TAssign ) do - _n_obra = n_obra - if n_obra != null then - n_obra.parent = self - end - _n_cbra = n_cbra - if n_cbra != null then - n_cbra.parent = self - end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end + empty_init + _n_obra = n_obra.as(not null) + n_obra.parent = self + _n_cbra = n_cbra.as(not null) + n_cbra.parent = self + _n_assign = n_assign.as(not null) + n_assign.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_obra == old_child then if new_child != null then new_child.parent = self assert new_child isa TObra _n_obra = new_child else - _n_obra = null + abort end return end @@ -4188,7 +2682,7 @@ redef class ABraassignMethid assert new_child isa TCbra _n_cbra = new_child else - _n_cbra = null + abort end return end @@ -4198,57 +2692,31 @@ redef class ABraassignMethid assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_obra != null then - v.visit(_n_obra) - end - if _n_cbra != null then - v.visit(_n_cbra) - end - if _n_assign != null then - v.visit(_n_assign) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_obra != null then - v.visit(_n_obra) - end - if _n_cbra != null then - v.visit(_n_cbra) - end - if _n_assign != null then - v.visit(_n_assign) - end + v.enter_visit(_n_obra) + v.enter_visit(_n_cbra) + v.enter_visit(_n_assign) end end redef class ASignature - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_asignature ( - n_params: Array[Object] , # Should be Array[PParam] - n_type: PType + n_params: Collection[Object], # Should be Collection[AParam] + n_type: nullable AType, + n_closure_decls: Collection[Object] # Should be Collection[AClosureDecl] ) do - _n_params = new List[PParam] + empty_init for n in n_params do - assert n isa PParam + assert n isa AParam _n_params.add(n) n.parent = self end @@ -4256,15 +2724,19 @@ redef class ASignature if n_type != null then n_type.parent = self end + for n in n_closure_decls do + assert n isa AClosureDecl + _n_closure_decls.add(n) + n.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_params.length[ do if _n_params[i] == old_child then if new_child != null then - assert new_child isa PParam + assert new_child isa AParam _n_params[i] = new_child new_child.parent = self else @@ -4276,74 +2748,52 @@ redef class ASignature if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else _n_type = null end return end + for i in [0.._n_closure_decls.length[ do + if _n_closure_decls[i] == old_child then + if new_child != null then + assert new_child isa AClosureDecl + _n_closure_decls[i] = new_child + new_child.parent = self + else + _n_closure_decls.remove_at(i) + end + return + end + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_params do - v.visit(n) + v.enter_visit(n) end if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_type.as(not null)) end - end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_params.length - while i >= 0 do - v.visit(_n_params[i]) - i = i - 1 + for n in _n_closure_decls do + v.enter_visit(n) end - end - if _n_type != null then - v.visit(_n_type) - end end end redef class AParam - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - redef meth n_dotdotdot=(n: TDotdotdot) - do - _n_dotdotdot = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aparam ( - n_id: TId , - n_type: PType , - n_dotdotdot: TDotdotdot + n_id: nullable TId, + n_type: nullable AType, + n_dotdotdot: nullable TDotdotdot ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self _n_type = n_type if n_type != null then n_type.parent = self @@ -4354,23 +2804,22 @@ redef class AParam end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else _n_type = null @@ -4389,77 +2838,161 @@ redef class AParam end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_id) if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_type.as(not null)) end if _n_dotdotdot != null then - v.visit(_n_dotdotdot) + v.enter_visit(_n_dotdotdot.as(not null)) end end +end +redef class AClosureDecl + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aclosuredecl ( + n_kwbreak: nullable TKwbreak, + n_bang: nullable TBang, + n_id: nullable TId, + n_signature: nullable ASignature, + n_expr: nullable AExpr + ) do - if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) + empty_init + _n_kwbreak = n_kwbreak + if n_kwbreak != null then + n_kwbreak.parent = self + end + _n_bang = n_bang.as(not null) + n_bang.parent = self + _n_id = n_id.as(not null) + n_id.parent = self + _n_signature = n_signature.as(not null) + n_signature.parent = self + _n_expr = n_expr + if n_expr != null then + n_expr.parent = self + end + end + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) + do + if _n_kwbreak == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwbreak + _n_kwbreak = new_child + else + _n_kwbreak = null + end + return + end + if _n_bang == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TBang + _n_bang = new_child + else + abort + end + return + end + if _n_id == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TId + _n_id = new_child + else + abort + end + return + end + if _n_signature == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ASignature + _n_signature = new_child + else + abort + end + return + end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + _n_expr = null + end + return + end + end + + redef fun visit_all(v: Visitor) + do + if _n_kwbreak != null then + v.enter_visit(_n_kwbreak.as(not null)) end - if _n_dotdotdot != null then - v.visit(_n_dotdotdot) + v.enter_visit(_n_bang) + v.enter_visit(_n_id) + v.enter_visit(_n_signature) + if _n_expr != null then + v.enter_visit(_n_expr.as(not null)) end end end redef class AType - redef meth n_id=(n: TClassid) - do - _n_id = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_atype ( - n_id: TClassid , - n_types: Array[Object] # Should be Array[PType] + n_kwnullable: nullable TKwnullable, + n_id: nullable TClassid, + n_types: Collection[Object] # Should be Collection[AType] ) do - _n_id = n_id - if n_id != null then - n_id.parent = self + empty_init + _n_kwnullable = n_kwnullable + if n_kwnullable != null then + n_kwnullable.parent = self end - _n_types = new List[PType] + _n_id = n_id.as(not null) + n_id.parent = self for n in n_types do - assert n isa PType + assert n isa AType _n_types.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null + if _n_kwnullable == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwnullable + _n_kwnullable = new_child + else + _n_kwnullable = null + end + return + end if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TClassid _n_id = new_child else - _n_id = null + abort end return end for i in [0.._n_types.length[ do if _n_types[i] == old_child then if new_child != null then - assert new_child isa PType + assert new_child isa AType _n_types[i] = new_child new_child.parent = self else @@ -4470,53 +3003,83 @@ redef class AType end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) + if _n_kwnullable != null then + v.enter_visit(_n_kwnullable.as(not null)) end + v.enter_visit(_n_id) for n in _n_types do - v.visit(n) + v.enter_visit(n) end end +end +redef class ALabel + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_alabel ( + n_kwlabel: nullable TKwlabel, + n_id: nullable TId + ) do - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_types.length - while i >= 0 do - v.visit(_n_types[i]) - i = i - 1 - end + empty_init + _n_kwlabel = n_kwlabel.as(not null) + n_kwlabel.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_kwlabel == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwlabel + _n_kwlabel = new_child + else + abort + end + return + end + if _n_id == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TId + _n_id = new_child + else + abort + end + return end end + + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_kwlabel) + v.enter_visit(_n_id) + end end redef class ABlockExpr - private init empty_init do end init init_ablockexpr ( - n_expr: Array[Object] # Should be Array[PExpr] + n_expr: Collection[Object] # Should be Collection[AExpr] ) do - _n_expr = new List[PExpr] + empty_init for n in n_expr do - assert n isa PExpr + assert n isa AExpr _n_expr.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_expr.length[ do if _n_expr[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_expr[i] = new_child new_child.parent = self else @@ -4527,79 +3090,29 @@ redef class ABlockExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_expr do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_expr.length - while i >= 0 do - v.visit(_n_expr[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class AVardeclExpr - redef meth n_kwvar=(n: TKwvar) - do - _n_kwvar = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_avardeclexpr ( - n_kwvar: TKwvar , - n_id: TId , - n_type: PType , - n_assign: TAssign , - n_expr: PExpr + n_kwvar: nullable TKwvar, + n_id: nullable TId, + n_type: nullable AType, + n_assign: nullable TAssign, + n_expr: nullable AExpr ) do - _n_kwvar = n_kwvar - if n_kwvar != null then - n_kwvar.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_kwvar = n_kwvar.as(not null) + n_kwvar.parent = self + _n_id = n_id.as(not null) + n_id.parent = self _n_type = n_type if n_type != null then n_type.parent = self @@ -4614,16 +3127,15 @@ redef class AVardeclExpr end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwvar == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwvar _n_kwvar = new_child else - _n_kwvar = null + abort end return end @@ -4633,14 +3145,14 @@ redef class AVardeclExpr assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else _n_type = null @@ -4660,7 +3172,7 @@ redef class AVardeclExpr if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else _n_expr = null @@ -4669,67 +3181,30 @@ redef class AVardeclExpr end end - redef meth visit_all(v: Visitor) - do - if _n_kwvar != null then - v.visit(_n_kwvar) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_type != null then - v.visit(_n_type) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwvar != null then - v.visit(_n_kwvar) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_kwvar) + v.enter_visit(_n_id) if _n_type != null then - v.visit(_n_type) + v.enter_visit(_n_type.as(not null)) end if _n_assign != null then - v.visit(_n_assign) + v.enter_visit(_n_assign.as(not null)) end if _n_expr != null then - v.visit(_n_expr) + v.enter_visit(_n_expr.as(not null)) end end end redef class AReturnExpr - redef meth n_kwreturn=(n: TKwreturn) - do - _n_kwreturn = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_areturnexpr ( - n_kwreturn: TKwreturn , - n_expr: PExpr + n_kwreturn: nullable TKwreturn, + n_expr: nullable AExpr ) do + empty_init _n_kwreturn = n_kwreturn if n_kwreturn != null then n_kwreturn.parent = self @@ -4740,9 +3215,8 @@ redef class AReturnExpr end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwreturn == old_child then if new_child != null then new_child.parent = self @@ -4756,7 +3230,7 @@ redef class AReturnExpr if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else _n_expr = null @@ -4765,150 +3239,140 @@ redef class AReturnExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwreturn != null then - v.visit(_n_kwreturn) + v.enter_visit(_n_kwreturn.as(not null)) end if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwreturn != null then - v.visit(_n_kwreturn) - end - if _n_expr != null then - v.visit(_n_expr) + v.enter_visit(_n_expr.as(not null)) end end end redef class ABreakExpr - redef meth n_kwbreak=(n: TKwbreak) - do - _n_kwbreak = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abreakexpr ( - n_kwbreak: TKwbreak + n_kwbreak: nullable TKwbreak, + n_label: nullable ALabel, + n_expr: nullable AExpr ) do - _n_kwbreak = n_kwbreak - if n_kwbreak != null then - n_kwbreak.parent = self + empty_init + _n_kwbreak = n_kwbreak.as(not null) + n_kwbreak.parent = self + _n_label = n_label + if n_label != null then + n_label.parent = self + end + _n_expr = n_expr + if n_expr != null then + n_expr.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwbreak == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwbreak _n_kwbreak = new_child else - _n_kwbreak = null + abort + end + return + end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null + end + return + end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + _n_expr = null end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwbreak != null then - v.visit(_n_kwbreak) + v.enter_visit(_n_kwbreak) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwbreak != null then - v.visit(_n_kwbreak) + if _n_expr != null then + v.enter_visit(_n_expr.as(not null)) end end end redef class AAbortExpr - redef meth n_kwabort=(n: TKwabort) - do - _n_kwabort = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aabortexpr ( - n_kwabort: TKwabort + n_kwabort: nullable TKwabort ) do - _n_kwabort = n_kwabort - if n_kwabort != null then - n_kwabort.parent = self - end + empty_init + _n_kwabort = n_kwabort.as(not null) + n_kwabort.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwabort == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwabort _n_kwabort = new_child else - _n_kwabort = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwabort != null then - v.visit(_n_kwabort) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwabort != null then - v.visit(_n_kwabort) - end + v.enter_visit(_n_kwabort) end end redef class AContinueExpr - redef meth n_kwcontinue=(n: TKwcontinue) - do - _n_kwcontinue = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acontinueexpr ( - n_kwcontinue: TKwcontinue + n_kwcontinue: nullable TKwcontinue, + n_label: nullable ALabel, + n_expr: nullable AExpr ) do + empty_init _n_kwcontinue = n_kwcontinue if n_kwcontinue != null then n_kwcontinue.parent = self end + _n_label = n_label + if n_label != null then + n_label.parent = self + end + _n_expr = n_expr + if n_expr != null then + n_expr.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwcontinue == old_child then if new_child != null then new_child.parent = self @@ -4919,147 +3383,123 @@ redef class AContinueExpr end return end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null + end + return + end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + _n_expr = null + end + return + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_kwcontinue != null then - v.visit(_n_kwcontinue) + v.enter_visit(_n_kwcontinue.as(not null)) end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwcontinue != null then - v.visit(_n_kwcontinue) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) + end + if _n_expr != null then + v.enter_visit(_n_expr.as(not null)) end end end redef class ADoExpr - redef meth n_kwdo=(n: TKwdo) - do - _n_kwdo = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_adoexpr ( - n_kwdo: TKwdo , - n_block: PExpr + n_kwdo: nullable TKwdo, + n_block: nullable AExpr, + n_label: nullable ALabel ) do - _n_kwdo = n_kwdo - if n_kwdo != null then - n_kwdo.parent = self - end + empty_init + _n_kwdo = n_kwdo.as(not null) + n_kwdo.parent = self _n_block = n_block if n_block != null then n_block.parent = self end + _n_label = n_label + if n_label != null then + n_label.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwdo == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwdo _n_kwdo = new_child else - _n_kwdo = null + abort end return end if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_block = new_child else _n_block = null end return end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null + end + return + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwdo != null then - v.visit(_n_kwdo) - end + v.enter_visit(_n_kwdo) if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwdo != null then - v.visit(_n_kwdo) + v.enter_visit(_n_block.as(not null)) end - if _n_block != null then - v.visit(_n_block) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end end end redef class AIfExpr - redef meth n_kwif=(n: TKwif) - do - _n_kwif = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_then=(n: PExpr) - do - _n_then = n - if n != null then - n.parent = self - end - end - redef meth n_else=(n: PExpr) - do - _n_else = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aifexpr ( - n_kwif: TKwif , - n_expr: PExpr , - n_then: PExpr , - n_else: PExpr + n_kwif: nullable TKwif, + n_expr: nullable AExpr, + n_then: nullable AExpr, + n_else: nullable AExpr ) do - _n_kwif = n_kwif - if n_kwif != null then - n_kwif.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_kwif = n_kwif.as(not null) + n_kwif.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self _n_then = n_then if n_then != null then n_then.parent = self @@ -5070,33 +3510,32 @@ redef class AIfExpr end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwif == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwif _n_kwif = new_child else - _n_kwif = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_then == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_then = new_child else _n_then = null @@ -5106,7 +3545,7 @@ redef class AIfExpr if _n_else == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_else = new_child else _n_else = null @@ -5115,139 +3554,64 @@ redef class AIfExpr end end - redef meth visit_all(v: Visitor) - do - if _n_kwif != null then - v.visit(_n_kwif) - end - if _n_expr != null then - v.visit(_n_expr) - end - if _n_then != null then - v.visit(_n_then) - end - if _n_else != null then - v.visit(_n_else) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwif != null then - v.visit(_n_kwif) - end - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_kwif) + v.enter_visit(_n_expr) if _n_then != null then - v.visit(_n_then) + v.enter_visit(_n_then.as(not null)) end if _n_else != null then - v.visit(_n_else) + v.enter_visit(_n_else.as(not null)) end end end redef class AIfexprExpr - redef meth n_kwif=(n: TKwif) - do - _n_kwif = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_kwthen=(n: TKwthen) - do - _n_kwthen = n - if n != null then - n.parent = self - end - end - redef meth n_then=(n: PExpr) - do - _n_then = n - if n != null then - n.parent = self - end - end - redef meth n_kwelse=(n: TKwelse) - do - _n_kwelse = n - if n != null then - n.parent = self - end - end - redef meth n_else=(n: PExpr) - do - _n_else = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aifexprexpr ( - n_kwif: TKwif , - n_expr: PExpr , - n_kwthen: TKwthen , - n_then: PExpr , - n_kwelse: TKwelse , - n_else: PExpr + 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 - _n_kwif = n_kwif - if n_kwif != null then - n_kwif.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_kwthen = n_kwthen - if n_kwthen != null then - n_kwthen.parent = self - end - _n_then = n_then - if n_then != null then - n_then.parent = self - end - _n_kwelse = n_kwelse - if n_kwelse != null then - n_kwelse.parent = self - end - _n_else = n_else - if n_else != null then - n_else.parent = self - end + empty_init + _n_kwif = n_kwif.as(not null) + 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.as(not null) + n_then.parent = self + _n_kwelse = n_kwelse.as(not null) + n_kwelse.parent = self + _n_else = n_else.as(not null) + n_else.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwif == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwif _n_kwif = new_child else - _n_kwif = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -5257,17 +3621,17 @@ redef class AIfexprExpr assert new_child isa TKwthen _n_kwthen = new_child else - _n_kwthen = null + abort end return end if _n_then == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_then = new_child else - _n_then = null + abort end return end @@ -5277,143 +3641,79 @@ redef class AIfexprExpr assert new_child isa TKwelse _n_kwelse = new_child else - _n_kwelse = null + abort end return end if _n_else == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_else = new_child else - _n_else = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwif != null then - v.visit(_n_kwif) - end - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwthen != null then - v.visit(_n_kwthen) - end - if _n_then != null then - v.visit(_n_then) - end - if _n_kwelse != null then - v.visit(_n_kwelse) - end - if _n_else != null then - v.visit(_n_else) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwif != null then - v.visit(_n_kwif) - end - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwthen != null then - v.visit(_n_kwthen) - end - if _n_then != null then - v.visit(_n_then) - end - if _n_kwelse != null then - v.visit(_n_kwelse) - end - if _n_else != null then - v.visit(_n_else) - end + 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 redef class AWhileExpr - redef meth n_kwwhile=(n: TKwwhile) - do - _n_kwwhile = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_kwdo=(n: TKwdo) - do - _n_kwdo = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_awhileexpr ( - n_kwwhile: TKwwhile , - n_expr: PExpr , - n_kwdo: TKwdo , - n_block: PExpr + n_kwwhile: nullable TKwwhile, + n_expr: nullable AExpr, + n_kwdo: nullable TKwdo, + n_block: nullable AExpr, + n_label: nullable ALabel ) do - _n_kwwhile = n_kwwhile - if n_kwwhile != null then - n_kwwhile.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_kwdo = n_kwdo - if n_kwdo != null then - n_kwdo.parent = self - end + empty_init + _n_kwwhile = n_kwwhile.as(not null) + n_kwwhile.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 end + _n_label = n_label + if n_label != null then + n_label.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwwhile == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwwhile _n_kwwhile = new_child else - _n_kwwhile = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -5423,321 +3723,262 @@ redef class AWhileExpr assert new_child isa TKwdo _n_kwdo = new_child else - _n_kwdo = null + abort end return end if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_block = new_child else _n_block = null end return end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null + end + return + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwwhile != null then - v.visit(_n_kwwhile) - end - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwdo != null then - v.visit(_n_kwdo) - end + v.enter_visit(_n_kwwhile) + v.enter_visit(_n_expr) + v.enter_visit(_n_kwdo) if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwwhile != null then - v.visit(_n_kwwhile) - end - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwdo != null then - v.visit(_n_kwdo) + v.enter_visit(_n_block.as(not null)) end - if _n_block != null then - v.visit(_n_block) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end end end -redef class AForExpr - redef meth n_vardecl=(n: PExpr) - do - _n_vardecl = n - if n != null then - n.parent = self - end - end - redef meth n_kwdo=(n: TKwdo) - do - _n_kwdo = n - if n != null then - n.parent = self - end - end - redef meth n_block=(n: PExpr) - do - _n_block = n - if n != null then - n.parent = self - end - end - +redef class ALoopExpr private init empty_init do end - init init_aforexpr ( - n_vardecl: PExpr , - n_kwdo: TKwdo , - n_block: PExpr + init init_aloopexpr ( + n_kwloop: nullable TKwloop, + n_block: nullable AExpr, + n_label: nullable ALabel ) do - _n_vardecl = n_vardecl - if n_vardecl != null then - n_vardecl.parent = self - end - _n_kwdo = n_kwdo - if n_kwdo != null then - n_kwdo.parent = self - end + empty_init + _n_kwloop = n_kwloop.as(not null) + n_kwloop.parent = self _n_block = n_block if n_block != null then n_block.parent = self end + _n_label = n_label + if n_label != null then + n_label.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null - if _n_vardecl == old_child then + if _n_kwloop == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr - _n_vardecl = new_child + assert new_child isa TKwloop + _n_kwloop = new_child else - _n_vardecl = null + abort end return end - if _n_kwdo == old_child then + if _n_block == old_child then if new_child != null then new_child.parent = self - assert new_child isa TKwdo - _n_kwdo = new_child + assert new_child isa AExpr + _n_block = new_child else - _n_kwdo = null + _n_block = null end return end - if _n_block == old_child then + if _n_label == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr - _n_block = new_child + assert new_child isa ALabel + _n_label = new_child else - _n_block = null + _n_label = null end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_vardecl != null then - v.visit(_n_vardecl) - end - if _n_kwdo != null then - v.visit(_n_kwdo) - end + v.enter_visit(_n_kwloop) if _n_block != null then - v.visit(_n_block) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_vardecl != null then - v.visit(_n_vardecl) - end - if _n_kwdo != null then - v.visit(_n_kwdo) + v.enter_visit(_n_block.as(not null)) end - if _n_block != null then - v.visit(_n_block) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end end end -redef class AForVardeclExpr - redef meth n_kwfor=(n: TKwfor) - do - _n_kwfor = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - +redef class AForExpr private init empty_init do end - init init_aforvardeclexpr ( - n_kwfor: TKwfor , - n_id: TId , - n_expr: PExpr + init init_aforexpr ( + n_kwfor: nullable TKwfor, + n_ids: Collection[Object], # Should be Collection[TId] + n_expr: nullable AExpr, + n_kwdo: nullable TKwdo, + n_block: nullable AExpr, + n_label: nullable ALabel ) do - _n_kwfor = n_kwfor - if n_kwfor != null then - n_kwfor.parent = self + empty_init + _n_kwfor = n_kwfor.as(not null) + n_kwfor.parent = self + for n in n_ids do + assert n isa TId + _n_ids.add(n) + n.parent = self end - _n_id = n_id - if n_id != null then - n_id.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 end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self + _n_label = n_label + if n_label != null then + n_label.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwfor == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwfor _n_kwfor = new_child else - _n_kwfor = null + abort end return end - if _n_id == old_child then + for i in [0.._n_ids.length[ do + if _n_ids[i] == old_child then + if new_child != null then + assert new_child isa TId + _n_ids[i] = new_child + new_child.parent = self + else + _n_ids.remove_at(i) + end + return + end + end + if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa TId - _n_id = new_child + assert new_child isa AExpr + _n_expr = new_child else - _n_id = null + abort end return end - if _n_expr == old_child then + if _n_kwdo == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr - _n_expr = new_child + assert new_child isa TKwdo + _n_kwdo = new_child else - _n_expr = null + abort + end + return + end + if _n_block == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_block = new_child + else + _n_block = null + end + return + end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwfor != null then - v.visit(_n_kwfor) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwfor != null then - v.visit(_n_kwfor) - end - if _n_id != null then - v.visit(_n_id) + v.enter_visit(_n_kwfor) + for n in _n_ids do + v.enter_visit(n) + end + v.enter_visit(_n_expr) + v.enter_visit(_n_kwdo) + if _n_block != null then + v.enter_visit(_n_block.as(not null)) end - if _n_expr != null then - v.visit(_n_expr) + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end end end redef class AAssertExpr - redef meth n_kwassert=(n: TKwassert) - do - _n_kwassert = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aassertexpr ( - n_kwassert: TKwassert , - n_id: TId , - n_expr: PExpr + n_kwassert: nullable TKwassert, + n_id: nullable TId, + n_expr: nullable AExpr, + n_else: nullable AExpr ) do - _n_kwassert = n_kwassert - if n_kwassert != null then - n_kwassert.parent = self - end + empty_init + _n_kwassert = n_kwassert.as(not null) + n_kwassert.parent = self _n_id = n_id if n_id != null then n_id.parent = self end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_else = n_else + if n_else != null then + n_else.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwassert == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwassert _n_kwassert = new_child else - _n_kwassert = null + abort end return end @@ -5754,1723 +3995,1148 @@ redef class AAssertExpr if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort + end + return + end + if _n_else == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_else = new_child + else + _n_else = null end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwassert != null then - v.visit(_n_kwassert) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwassert != null then - v.visit(_n_kwassert) - end + v.enter_visit(_n_kwassert) if _n_id != null then - v.visit(_n_id) + v.enter_visit(_n_id.as(not null)) end - if _n_expr != null then - v.visit(_n_expr) + v.enter_visit(_n_expr) + if _n_else != null then + v.enter_visit(_n_else.as(not null)) end end end redef class AOnceExpr - redef meth n_kwonce=(n: TKwonce) - do - _n_kwonce = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aonceexpr ( - n_kwonce: TKwonce , - n_expr: PExpr + n_kwonce: nullable TKwonce, + n_expr: nullable AExpr ) do - _n_kwonce = n_kwonce - if n_kwonce != null then - n_kwonce.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_kwonce = n_kwonce.as(not null) + n_kwonce.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwonce == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwonce _n_kwonce = new_child else - _n_kwonce = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwonce != null then - v.visit(_n_kwonce) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwonce != null then - v.visit(_n_kwonce) - end - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_kwonce) + v.enter_visit(_n_expr) end end redef class ASendExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_asendexpr ( - n_expr: PExpr + n_expr: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_expr) end end redef class ABinopExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abinopexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AOrExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aorexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AAndExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aandexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end +end +redef class AOrElseExpr + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aorelseexpr ( + n_expr: nullable AExpr, + n_expr2: nullable AExpr + ) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end -end -redef class ANotExpr - redef meth n_kwnot=(n: TKwnot) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_kwnot = n - if n != null then - n.parent = self - end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return + end + if _n_expr2 == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr2 = new_child + else + abort + end + return + end end - redef meth n_expr=(n: PExpr) + + redef fun visit_all(v: Visitor) do - _n_expr = n - if n != null then - n.parent = self - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end - +end +redef class ANotExpr private init empty_init do end init init_anotexpr ( - n_kwnot: TKwnot , - n_expr: PExpr + n_kwnot: nullable TKwnot, + n_expr: nullable AExpr ) do - _n_kwnot = n_kwnot - if n_kwnot != null then - n_kwnot.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_kwnot = n_kwnot.as(not null) + n_kwnot.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwnot == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwnot _n_kwnot = new_child else - _n_kwnot = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwnot != null then - v.visit(_n_kwnot) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwnot != null then - v.visit(_n_kwnot) - end - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_kwnot) + v.enter_visit(_n_expr) end end redef class AEqExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aeqexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AEeExpr - redef meth n_expr=(n: PExpr) + private init empty_init do end + + init init_aeeexpr ( + n_expr: nullable AExpr, + n_expr2: nullable AExpr + ) do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - - private init empty_init do end - - init init_aeeexpr ( - n_expr: PExpr , - n_expr2: PExpr - ) - do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class ANeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aneexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class ALtExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_altexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class ALeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aleexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end +end +redef class ALlExpr + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_allexpr ( + n_expr: nullable AExpr, + n_expr2: nullable AExpr + ) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end -end -redef class AGtExpr - redef meth n_expr=(n: PExpr) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_expr = n - if n != null then - n.parent = self - end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return + end + if _n_expr2 == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr2 = new_child + else + abort + end + return + end end - redef meth n_expr2=(n: PExpr) + + redef fun visit_all(v: Visitor) do - _n_expr2 = n - if n != null then - n.parent = self - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end - +end +redef class AGtExpr private init empty_init do end init init_agtexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AGeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_ageexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end +end +redef class AGgExpr + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aggexpr ( + n_expr: nullable AExpr, + n_expr2: nullable AExpr + ) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end -end -redef class AIsaExpr - redef meth n_expr=(n: PExpr) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_expr = n - if n != null then - n.parent = self - end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return + end + if _n_expr2 == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr2 = new_child + else + abort + end + return + end end - redef meth n_type=(n: PType) + + redef fun visit_all(v: Visitor) do - _n_type = n - if n != null then - n.parent = self - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end - +end +redef class AIsaExpr private init empty_init do end init init_aisaexpr ( - n_expr: PExpr , - n_type: PType + n_expr: nullable AExpr, + n_type: nullable AType ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_type = n_type - if n_type != null then - n_type.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_type = n_type.as(not null) + n_type.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else - _n_type = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_type != null then - v.visit(_n_type) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_type != null then - v.visit(_n_type) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_type) end end redef class APlusExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aplusexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AMinusExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aminusexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AStarshipExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astarshipexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AStarExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astarexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class ASlashExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aslashexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class APercentExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_apercentexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AUminusExpr - redef meth n_minus=(n: TMinus) - do - _n_minus = n - if n != null then - n.parent = self - end - end - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_auminusexpr ( - n_minus: TMinus , - n_expr: PExpr + n_minus: nullable TMinus, + n_expr: nullable AExpr ) do - _n_minus = n_minus - if n_minus != null then - n_minus.parent = self - end - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_minus = n_minus.as(not null) + n_minus.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_minus == old_child then if new_child != null then new_child.parent = self assert new_child isa TMinus _n_minus = new_child else - _n_minus = null + abort end return end if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_minus != null then - v.visit(_n_minus) - end - if _n_expr != null then - v.visit(_n_expr) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_minus != null then - v.visit(_n_minus) - end - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_minus) + v.enter_visit(_n_expr) end end redef class ANewExpr - redef meth n_kwnew=(n: TKwnew) - do - _n_kwnew = n - if n != null then - n.parent = self - end - end - redef meth n_type=(n: PType) - do - _n_type = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_anewexpr ( - n_kwnew: TKwnew , - n_type: PType , - n_id: TId , - n_args: Array[Object] # Should be Array[PExpr] + n_kwnew: nullable TKwnew, + n_type: nullable AType, + n_id: nullable TId, + n_args: Collection[Object] # Should be Collection[AExpr] ) do - _n_kwnew = n_kwnew - if n_kwnew != null then - n_kwnew.parent = self - end - _n_type = n_type - if n_type != null then - n_type.parent = self - end + empty_init + _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 end - _n_args = new List[PExpr] for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwnew == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwnew _n_kwnew = new_child else - _n_kwnew = null + abort end return end if _n_type == old_child then if new_child != null then new_child.parent = self - assert new_child isa PType + assert new_child isa AType _n_type = new_child else - _n_type = null + abort end return end @@ -7487,7 +5153,7 @@ redef class ANewExpr for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -7498,85 +5164,42 @@ redef class ANewExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwnew != null then - v.visit(_n_kwnew) - end - if _n_type != null then - v.visit(_n_type) - end + v.enter_visit(_n_kwnew) + v.enter_visit(_n_type) if _n_id != null then - v.visit(_n_id) + v.enter_visit(_n_id.as(not null)) end for n in _n_args do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_kwnew != null then - v.visit(_n_kwnew) - end - if _n_type != null then - v.visit(_n_type) - end - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class AAttrExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TAttrid) - do - _n_id = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aattrexpr ( - n_expr: PExpr , - n_id: TAttrid + n_expr: nullable AExpr, + n_id: nullable TAttrid ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_id = n_id.as(not null) + n_id.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -7586,99 +5209,48 @@ redef class AAttrExpr assert new_child isa TAttrid _n_id = new_child else - _n_id = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_id) end end redef class AAttrAssignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TAttrid) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aattrassignexpr ( - n_expr: PExpr , - n_id: TAttrid , - n_assign: TAssign , - n_value: PExpr + n_expr: nullable AExpr, + n_id: nullable TAttrid, + n_assign: nullable TAssign, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + empty_init + _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 end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -7688,7 +5260,7 @@ redef class AAttrAssignExpr assert new_child isa TAttrid _n_id = new_child else - _n_id = null + abort end return end @@ -7698,121 +5270,60 @@ redef class AAttrAssignExpr assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_id) + v.enter_visit(_n_assign) + v.enter_visit(_n_value) end end redef class AAttrReassignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TAttrid) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign_op=(n: PAssignOp) - do - _n_assign_op = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aattrreassignexpr ( - n_expr: PExpr , - n_id: TAttrid , - n_assign_op: PAssignOp , - n_value: PExpr + n_expr: nullable AExpr, + n_id: nullable TAttrid, + n_assign_op: nullable AAssignOp, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_assign_op = n_assign_op - if n_assign_op != null then - n_assign_op.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + empty_init + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -7822,114 +5333,76 @@ redef class AAttrReassignExpr assert new_child isa TAttrid _n_id = new_child else - _n_id = null + abort end return end if _n_assign_op == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAssignOp + assert new_child isa AAssignOp _n_assign_op = new_child else - _n_assign_op = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end + 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 - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acallexpr ( - n_expr: PExpr , - n_id: TId , - n_args: Array[Object] # Should be Array[PExpr] + n_expr: nullable AExpr, + n_id: nullable TId, + n_args: Collection[Object], # Should be Collection[AExpr] + n_closure_defs: Collection[Object] # Should be Collection[AClosureDef] ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_id = n_id.as(not null) + n_id.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end + for n in n_closure_defs do + assert n isa AClosureDef + _n_closure_defs.add(n) + n.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -7939,14 +5412,14 @@ redef class ACallExpr assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -7955,112 +5428,68 @@ redef class ACallExpr return end end + for i in [0.._n_closure_defs.length[ do + if _n_closure_defs[i] == old_child then + if new_child != null then + assert new_child isa AClosureDef + _n_closure_defs[i] = new_child + new_child.parent = self + else + _n_closure_defs.remove_at(i) + end + return + end + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_id) for n in _n_args do - v.visit(n) + v.enter_visit(n) end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + for n in _n_closure_defs do + v.enter_visit(n) end - end end end redef class ACallAssignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acallassignexpr ( - n_expr: PExpr , - n_id: TId , - n_args: Array[Object] , # Should be Array[PExpr] - n_assign: TAssign , - n_value: PExpr + n_expr: nullable AExpr, + n_id: nullable TId, + n_args: Collection[Object], # Should be Collection[AExpr] + n_assign: nullable TAssign, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_id = n_id.as(not null) + n_id.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + _n_assign = n_assign.as(not null) + n_assign.parent = self + _n_value = n_value.as(not null) + n_value.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -8070,14 +5499,14 @@ redef class ACallAssignExpr assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8092,138 +5521,69 @@ redef class ACallAssignExpr assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_id) for n in _n_args do - v.visit(n) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_assign) + v.enter_visit(_n_value) end end redef class ACallReassignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign_op=(n: PAssignOp) - do - _n_assign_op = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acallreassignexpr ( - n_expr: PExpr , - n_id: TId , - n_args: Array[Object] , # Should be Array[PExpr] - n_assign_op: PAssignOp , - n_value: PExpr + n_expr: nullable AExpr, + n_id: nullable TId, + n_args: Collection[Object], # Should be Collection[AExpr] + n_assign_op: nullable AAssignOp, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_id = n_id.as(not null) + n_id.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end - _n_assign_op = n_assign_op - if n_assign_op != null then - n_assign_op.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -8233,14 +5593,14 @@ redef class ACallReassignExpr assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8252,114 +5612,65 @@ redef class ACallReassignExpr if _n_assign_op == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAssignOp + assert new_child isa AAssignOp _n_assign_op = new_child else - _n_assign_op = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_id) for n in _n_args do - v.visit(n) - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_id != null then - v.visit(_n_id) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_assign_op) + v.enter_visit(_n_value) end end redef class ASuperExpr - redef meth n_qualified=(n: PQualified) - do - _n_qualified = n - if n != null then - n.parent = self - end - end - redef meth n_kwsuper=(n: TKwsuper) - do - _n_kwsuper = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_asuperexpr ( - n_qualified: PQualified , - n_kwsuper: TKwsuper , - n_args: Array[Object] # Should be Array[PExpr] + n_qualified: nullable AQualified, + n_kwsuper: nullable TKwsuper, + n_args: Collection[Object] # Should be Collection[AExpr] ) do + empty_init _n_qualified = n_qualified if n_qualified != null then n_qualified.parent = self end - _n_kwsuper = n_kwsuper - if n_kwsuper != null then - n_kwsuper.parent = self - end - _n_args = new List[PExpr] + _n_kwsuper = n_kwsuper.as(not null) + n_kwsuper.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_qualified == old_child then if new_child != null then new_child.parent = self - assert new_child isa PQualified + assert new_child isa AQualified _n_qualified = new_child else _n_qualified = null @@ -8372,14 +5683,14 @@ redef class ASuperExpr assert new_child isa TKwsuper _n_kwsuper = new_child else - _n_kwsuper = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8390,86 +5701,47 @@ redef class ASuperExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_qualified != null then - v.visit(_n_qualified) - end - if _n_kwsuper != null then - v.visit(_n_kwsuper) + v.enter_visit(_n_qualified.as(not null)) end + v.enter_visit(_n_kwsuper) for n in _n_args do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_qualified != null then - v.visit(_n_qualified) - end - if _n_kwsuper != null then - v.visit(_n_kwsuper) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class AInitExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_kwinit=(n: TKwinit) - do - _n_kwinit = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_ainitexpr ( - n_expr: PExpr , - n_kwinit: TKwinit , - n_args: Array[Object] # Should be Array[PExpr] + n_expr: nullable AExpr, + n_kwinit: nullable TKwinit, + n_args: Collection[Object] # Should be Collection[AExpr] ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_kwinit = n_kwinit - if n_kwinit != null then - n_kwinit.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_kwinit = n_kwinit.as(not null) + n_kwinit.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end @@ -8479,14 +5751,14 @@ redef class AInitExpr assert new_child isa TKwinit _n_kwinit = new_child else - _n_kwinit = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8497,81 +5769,55 @@ redef class AInitExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwinit != null then - v.visit(_n_kwinit) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_kwinit) for n in _n_args do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_kwinit != null then - v.visit(_n_kwinit) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class ABraExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abraexpr ( - n_expr: PExpr , - n_args: Array[Object] # Should be Array[PExpr] + n_expr: nullable AExpr, + n_args: Collection[Object], # Should be Collection[AExpr] + n_closure_defs: Collection[Object] # Should be Collection[AClosureDef] ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end + for n in n_closure_defs do + assert n isa AClosureDef + _n_closure_defs.add(n) + n.parent = self + end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8580,101 +5826,71 @@ redef class ABraExpr return end end + for i in [0.._n_closure_defs.length[ do + if _n_closure_defs[i] == old_child then + if new_child != null then + assert new_child isa AClosureDef + _n_closure_defs[i] = new_child + new_child.parent = self + else + _n_closure_defs.remove_at(i) + end + return + end + end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_expr) for n in _n_args do - v.visit(n) + v.enter_visit(n) end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + for n in _n_closure_defs do + v.enter_visit(n) end - end end end redef class ABraAssignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abraassignexpr ( - n_expr: PExpr , - n_args: Array[Object] , # Should be Array[PExpr] - n_assign: TAssign , - n_value: PExpr + n_expr: nullable AExpr, + n_args: Collection[Object], # Should be Collection[AExpr] + n_assign: nullable TAssign, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + _n_assign = n_assign.as(not null) + n_assign.parent = self + _n_value = n_value.as(not null) + n_value.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8689,127 +5905,72 @@ redef class ABraAssignExpr assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_expr) for n in _n_args do - v.visit(n) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 + v.enter_visit(n) end - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_assign) + v.enter_visit(_n_value) end end redef class ABraReassignExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_assign_op=(n: PAssignOp) - do - _n_assign_op = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_abrareassignexpr ( - n_expr: PExpr , - n_args: Array[Object] , # Should be Array[PExpr] - n_assign_op: PAssignOp , - n_value: PExpr + n_expr: nullable AExpr, + n_args: Collection[Object], # Should be Collection[AExpr] + n_assign_op: nullable AAssignOp, + n_value: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_args = new List[PExpr] + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self for n in n_args do - assert n isa PExpr + assert n isa AExpr _n_args.add(n) n.parent = self end - _n_assign_op = n_assign_op - if n_assign_op != null then - n_assign_op.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end for i in [0.._n_args.length[ do if _n_args[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_args[i] = new_child new_child.parent = self else @@ -8821,166 +5982,166 @@ redef class ABraReassignExpr if _n_assign_op == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAssignOp + assert new_child isa AAssignOp _n_assign_op = new_child else - _n_assign_op = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_expr) for n in _n_args do - v.visit(n) + v.enter_visit(n) end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_assign_op) + v.enter_visit(_n_value) end +end +redef class AClosureCallExpr + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aclosurecallexpr ( + n_id: nullable TId, + n_args: Collection[Object], # Should be Collection[AExpr] + n_closure_defs: Collection[Object] # Should be Collection[AClosureDef] + ) do - if _n_expr != null then - v.visit(_n_expr) - end - do - var i = _n_args.length - while i >= 0 do - v.visit(_n_args[i]) - i = i - 1 - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self + for n in n_args do + assert n isa AExpr + _n_args.add(n) + n.parent = self + end + for n in n_closure_defs do + assert n isa AClosureDef + _n_closure_defs.add(n) + n.parent = self end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end end -end -redef class AVarExpr - redef meth n_id=(n: TId) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_id = n - if n != null then - n.parent = self + if _n_id == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TId + _n_id = new_child + else + abort + end + return + end + for i in [0.._n_args.length[ do + if _n_args[i] == old_child then + if new_child != null then + assert new_child isa AExpr + _n_args[i] = new_child + new_child.parent = self + else + _n_args.remove_at(i) + end + return + end + end + for i in [0.._n_closure_defs.length[ do + if _n_closure_defs[i] == old_child then + if new_child != null then + assert new_child isa AClosureDef + _n_closure_defs[i] = new_child + new_child.parent = self + else + _n_closure_defs.remove_at(i) + end + return + end end end + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_id) + for n in _n_args do + v.enter_visit(n) + end + for n in _n_closure_defs do + v.enter_visit(n) + end + end +end +redef class AVarExpr private init empty_init do end init init_avarexpr ( - n_id: TId + n_id: nullable TId ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end + empty_init + _n_id = n_id.as(not null) + n_id.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end + v.enter_visit(_n_id) end end redef class AVarAssignExpr - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign=(n: TAssign) - do - _n_assign = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_avarassignexpr ( - n_id: TId , - n_assign: TAssign , - n_value: PExpr + n_id: nullable TId, + n_assign: nullable TAssign, + n_value: nullable AExpr ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_assign = n_assign - if n_assign != null then - n_assign.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + empty_init + _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 end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end @@ -8990,411 +6151,244 @@ redef class AVarAssignExpr assert new_child isa TAssign _n_assign = new_child else - _n_assign = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign != null then - v.visit(_n_assign) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_id) + v.enter_visit(_n_assign) + v.enter_visit(_n_value) end end redef class AVarReassignExpr - redef meth n_id=(n: TId) - do - _n_id = n - if n != null then - n.parent = self - end - end - redef meth n_assign_op=(n: PAssignOp) - do - _n_assign_op = n - if n != null then - n.parent = self - end - end - redef meth n_value=(n: PExpr) - do - _n_value = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_avarreassignexpr ( - n_id: TId , - n_assign_op: PAssignOp , - n_value: PExpr + n_id: nullable TId, + n_assign_op: nullable AAssignOp, + n_value: nullable AExpr ) do - _n_id = n_id - if n_id != null then - n_id.parent = self - end - _n_assign_op = n_assign_op - if n_assign_op != null then - n_assign_op.parent = self - end - _n_value = n_value - if n_value != null then - n_value.parent = self - end + empty_init + _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 meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_id == old_child then if new_child != null then new_child.parent = self assert new_child isa TId _n_id = new_child else - _n_id = null + abort end return end if _n_assign_op == old_child then if new_child != null then new_child.parent = self - assert new_child isa PAssignOp + assert new_child isa AAssignOp _n_assign_op = new_child else - _n_assign_op = null + abort end return end if _n_value == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_value = new_child else - _n_value = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_id != null then - v.visit(_n_id) - end - if _n_assign_op != null then - v.visit(_n_assign_op) - end - if _n_value != null then - v.visit(_n_value) - end + v.enter_visit(_n_id) + v.enter_visit(_n_assign_op) + v.enter_visit(_n_value) end end redef class ARangeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_arangeexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class ACrangeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acrangeexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AOrangeExpr - redef meth n_expr=(n: PExpr) - do - _n_expr = n - if n != null then - n.parent = self - end - end - redef meth n_expr2=(n: PExpr) - do - _n_expr2 = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aorangeexpr ( - n_expr: PExpr , - n_expr2: PExpr + n_expr: nullable AExpr, + n_expr2: nullable AExpr ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end - _n_expr2 = n_expr2 - if n_expr2 != null then - n_expr2.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_expr2 = n_expr2.as(not null) + n_expr2.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort end return end if _n_expr2 == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr2 = new_child else - _n_expr2 = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end - if _n_expr2 != null then - v.visit(_n_expr2) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_expr2) end end redef class AArrayExpr - private init empty_init do end init init_aarrayexpr ( - n_exprs: Array[Object] # Should be Array[PExpr] + n_exprs: Collection[Object] # Should be Collection[AExpr] ) do - _n_exprs = new List[PExpr] + empty_init for n in n_exprs do - assert n isa PExpr + assert n isa AExpr _n_exprs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_exprs.length[ do if _n_exprs[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_exprs[i] = new_child new_child.parent = self else @@ -9405,618 +6399,391 @@ redef class AArrayExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_exprs do - v.visit(n) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_exprs.length - while i >= 0 do - v.visit(_n_exprs[i]) - i = i - 1 + v.enter_visit(n) end - end end end redef class ASelfExpr - redef meth n_kwself=(n: TKwself) - do - _n_kwself = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aselfexpr ( - n_kwself: TKwself + n_kwself: nullable TKwself ) do - _n_kwself = n_kwself - if n_kwself != null then - n_kwself.parent = self - end + empty_init + _n_kwself = n_kwself.as(not null) + n_kwself.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwself == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwself _n_kwself = new_child else - _n_kwself = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwself != null then - v.visit(_n_kwself) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwself != null then - v.visit(_n_kwself) - end + v.enter_visit(_n_kwself) end end redef class AImplicitSelfExpr - private init empty_init do end init init_aimplicitselfexpr do + empty_init end - redef meth replace_child(old_child: PNode, new_child: PNode) - do - assert old_child != null - end - - redef meth visit_all(v: Visitor) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do end - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do end end redef class ATrueExpr - redef meth n_kwtrue=(n: TKwtrue) - do - _n_kwtrue = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_atrueexpr ( - n_kwtrue: TKwtrue + n_kwtrue: nullable TKwtrue ) do - _n_kwtrue = n_kwtrue - if n_kwtrue != null then - n_kwtrue.parent = self - end + empty_init + _n_kwtrue = n_kwtrue.as(not null) + n_kwtrue.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwtrue == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwtrue _n_kwtrue = new_child else - _n_kwtrue = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwtrue != null then - v.visit(_n_kwtrue) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwtrue != null then - v.visit(_n_kwtrue) - end + v.enter_visit(_n_kwtrue) end end redef class AFalseExpr - redef meth n_kwfalse=(n: TKwfalse) - do - _n_kwfalse = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_afalseexpr ( - n_kwfalse: TKwfalse + n_kwfalse: nullable TKwfalse ) do - _n_kwfalse = n_kwfalse - if n_kwfalse != null then - n_kwfalse.parent = self - end + empty_init + _n_kwfalse = n_kwfalse.as(not null) + n_kwfalse.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwfalse == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwfalse _n_kwfalse = new_child else - _n_kwfalse = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwfalse != null then - v.visit(_n_kwfalse) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwfalse != null then - v.visit(_n_kwfalse) - end + v.enter_visit(_n_kwfalse) end end redef class ANullExpr - redef meth n_kwnull=(n: TKwnull) - do - _n_kwnull = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_anullexpr ( - n_kwnull: TKwnull + n_kwnull: nullable TKwnull ) do - _n_kwnull = n_kwnull - if n_kwnull != null then - n_kwnull.parent = self - end + empty_init + _n_kwnull = n_kwnull.as(not null) + n_kwnull.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_kwnull == old_child then if new_child != null then new_child.parent = self assert new_child isa TKwnull _n_kwnull = new_child else - _n_kwnull = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_kwnull != null then - v.visit(_n_kwnull) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_kwnull != null then - v.visit(_n_kwnull) - end + v.enter_visit(_n_kwnull) end end redef class AIntExpr - redef meth n_number=(n: TNumber) - do - _n_number = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aintexpr ( - n_number: TNumber + n_number: nullable TNumber ) do - _n_number = n_number - if n_number != null then - n_number.parent = self - end + empty_init + _n_number = n_number.as(not null) + n_number.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_number == old_child then if new_child != null then new_child.parent = self assert new_child isa TNumber _n_number = new_child else - _n_number = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_number != null then - v.visit(_n_number) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - if _n_number != null then - v.visit(_n_number) - end + v.enter_visit(_n_number) end end redef class AFloatExpr - redef meth n_float=(n: TFloat) - do - _n_float = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_afloatexpr ( - n_float: TFloat + n_float: nullable TFloat ) do - _n_float = n_float - if n_float != null then - n_float.parent = self - end + empty_init + _n_float = n_float.as(not null) + n_float.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_float == old_child then if new_child != null then new_child.parent = self assert new_child isa TFloat _n_float = new_child else - _n_float = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_float != null then - v.visit(_n_float) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_float != null then - v.visit(_n_float) - end + v.enter_visit(_n_float) end end redef class ACharExpr - redef meth n_char=(n: TChar) - do - _n_char = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_acharexpr ( - n_char: TChar + n_char: nullable TChar ) do - _n_char = n_char - if n_char != null then - n_char.parent = self - end + empty_init + _n_char = n_char.as(not null) + n_char.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_char == old_child then if new_child != null then new_child.parent = self assert new_child isa TChar _n_char = new_child else - _n_char = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_char != null then - v.visit(_n_char) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_char != null then - v.visit(_n_char) - end + v.enter_visit(_n_char) end end redef class AStringExpr - redef meth n_string=(n: TString) - do - _n_string = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astringexpr ( - n_string: TString + n_string: nullable TString ) do - _n_string = n_string - if n_string != null then - n_string.parent = self - end + empty_init + _n_string = n_string.as(not null) + n_string.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_string == old_child then if new_child != null then new_child.parent = self assert new_child isa TString _n_string = new_child else - _n_string = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_string != null then - v.visit(_n_string) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_string != null then - v.visit(_n_string) - end + v.enter_visit(_n_string) end end redef class AStartStringExpr - redef meth n_string=(n: TStartString) - do - _n_string = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_astartstringexpr ( - n_string: TStartString + n_string: nullable TStartString ) do - _n_string = n_string - if n_string != null then - n_string.parent = self - end + empty_init + _n_string = n_string.as(not null) + n_string.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_string == old_child then if new_child != null then new_child.parent = self assert new_child isa TStartString _n_string = new_child else - _n_string = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_string != null then - v.visit(_n_string) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_string != null then - v.visit(_n_string) - end + v.enter_visit(_n_string) end end redef class AMidStringExpr - redef meth n_string=(n: TMidString) - do - _n_string = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_amidstringexpr ( - n_string: TMidString + n_string: nullable TMidString ) do - _n_string = n_string - if n_string != null then - n_string.parent = self - end + empty_init + _n_string = n_string.as(not null) + n_string.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_string == old_child then if new_child != null then new_child.parent = self assert new_child isa TMidString _n_string = new_child else - _n_string = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_string != null then - v.visit(_n_string) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_string != null then - v.visit(_n_string) - end + v.enter_visit(_n_string) end end redef class AEndStringExpr - redef meth n_string=(n: TEndString) - do - _n_string = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aendstringexpr ( - n_string: TEndString + n_string: nullable TEndString ) do - _n_string = n_string - if n_string != null then - n_string.parent = self - end + empty_init + _n_string = n_string.as(not null) + n_string.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_string == old_child then if new_child != null then new_child.parent = self assert new_child isa TEndString _n_string = new_child else - _n_string = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_string != null then - v.visit(_n_string) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_string != null then - v.visit(_n_string) - end + v.enter_visit(_n_string) end end redef class ASuperstringExpr - private init empty_init do end init init_asuperstringexpr ( - n_exprs: Array[Object] # Should be Array[PExpr] + n_exprs: Collection[Object] # Should be Collection[AExpr] ) do - _n_exprs = new List[PExpr] + empty_init for n in n_exprs do - assert n isa PExpr + assert n isa AExpr _n_exprs.add(n) n.parent = self end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_exprs.length[ do if _n_exprs[i] == old_child then if new_child != null then - assert new_child isa PExpr + assert new_child isa AExpr _n_exprs[i] = new_child new_child.parent = self else @@ -10027,191 +6794,488 @@ redef class ASuperstringExpr end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_exprs do - v.visit(n) + v.enter_visit(n) end end +end +redef class AParExpr + private init empty_init do end + + init init_aparexpr ( + n_expr: nullable AExpr + ) + do + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + end - redef meth visit_all_reverse(v: Visitor) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - do - var i = _n_exprs.length - while i >= 0 do - v.visit(_n_exprs[i]) - i = i - 1 - end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return end end + + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_expr) + end end -redef class AParExpr - redef meth n_expr=(n: PExpr) +redef class AAsCastExpr + private init empty_init do end + + init init_aascastexpr ( + n_expr: nullable AExpr, + n_kwas: nullable TKwas, + n_type: nullable AType + ) do - _n_expr = n - if n != null then - n.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_kwas = n_kwas.as(not null) + n_kwas.parent = self + _n_type = n_type.as(not null) + n_type.parent = self + end + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) + do + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return + end + if _n_kwas == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwas + _n_kwas = new_child + else + abort + end + return + end + if _n_type == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AType + _n_type = new_child + else + abort + end + return + end end + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_expr) + v.enter_visit(_n_kwas) + v.enter_visit(_n_type) + end +end +redef class AAsNotnullExpr private init empty_init do end - init init_aparexpr ( - n_expr: PExpr + init init_aasnotnullexpr ( + n_expr: nullable AExpr, + n_kwas: nullable TKwas, + n_kwnot: nullable TKwnot, + n_kwnull: nullable TKwnull ) do - _n_expr = n_expr - if n_expr != null then - n_expr.parent = self - end + empty_init + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_kwas = n_kwas.as(not null) + n_kwas.parent = self + _n_kwnot = n_kwnot.as(not null) + n_kwnot.parent = self + _n_kwnull = n_kwnull.as(not null) + n_kwnull.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_expr == old_child then if new_child != null then new_child.parent = self - assert new_child isa PExpr + assert new_child isa AExpr _n_expr = new_child else - _n_expr = null + abort + end + return + end + if _n_kwas == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwas + _n_kwas = new_child + else + abort + end + return + end + if _n_kwnot == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwnot + _n_kwnot = new_child + else + abort + end + return + end + if _n_kwnull == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwnull + _n_kwnull = new_child + else + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_expr != null then - v.visit(_n_expr) - end + v.enter_visit(_n_expr) + v.enter_visit(_n_kwas) + v.enter_visit(_n_kwnot) + v.enter_visit(_n_kwnull) end +end +redef class AIssetAttrExpr + private init empty_init do end - redef meth visit_all_reverse(v: Visitor) + init init_aissetattrexpr ( + n_kwisset: nullable TKwisset, + n_expr: nullable AExpr, + n_id: nullable TAttrid + ) do - if _n_expr != null then - v.visit(_n_expr) - end + empty_init + _n_kwisset = n_kwisset.as(not null) + n_kwisset.parent = self + _n_expr = n_expr.as(not null) + n_expr.parent = self + _n_id = n_id.as(not null) + n_id.parent = self end -end -redef class APlusAssignOp - redef meth n_pluseq=(n: TPluseq) + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - _n_pluseq = n - if n != null then - n.parent = self - end + if _n_kwisset == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwisset + _n_kwisset = new_child + else + abort + end + return + end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + abort + end + return + end + if _n_id == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TAttrid + _n_id = new_child + else + abort + end + return + end end + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_kwisset) + v.enter_visit(_n_expr) + v.enter_visit(_n_id) + end +end +redef class APlusAssignOp private init empty_init do end init init_aplusassignop ( - n_pluseq: TPluseq + n_pluseq: nullable TPluseq ) do - _n_pluseq = n_pluseq - if n_pluseq != null then - n_pluseq.parent = self - end + empty_init + _n_pluseq = n_pluseq.as(not null) + n_pluseq.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_pluseq == old_child then if new_child != null then new_child.parent = self assert new_child isa TPluseq _n_pluseq = new_child else - _n_pluseq = null + abort end return end end - redef meth visit_all(v: Visitor) - do - if _n_pluseq != null then - v.visit(_n_pluseq) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_pluseq != null then - v.visit(_n_pluseq) - end + v.enter_visit(_n_pluseq) end end redef class AMinusAssignOp - redef meth n_minuseq=(n: TMinuseq) - do - _n_minuseq = n - if n != null then - n.parent = self - end - end - private init empty_init do end init init_aminusassignop ( - n_minuseq: TMinuseq + n_minuseq: nullable TMinuseq ) do - _n_minuseq = n_minuseq - if n_minuseq != null then - n_minuseq.parent = self - end + empty_init + _n_minuseq = n_minuseq.as(not null) + n_minuseq.parent = self end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_minuseq == old_child then if new_child != null then new_child.parent = self assert new_child isa TMinuseq _n_minuseq = new_child else - _n_minuseq = null + abort end return end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_minuseq) + end +end +redef class AClosureDef + private init empty_init do end + + init init_aclosuredef ( + n_bang: nullable TBang, + n_id: nullable AClosureId, + n_ids: Collection[Object], # Should be Collection[TId] + n_kwdo: nullable TKwdo, + n_expr: nullable AExpr, + n_label: nullable ALabel + ) do - if _n_minuseq != null then - v.visit(_n_minuseq) + empty_init + _n_bang = n_bang.as(not null) + n_bang.parent = self + _n_id = n_id.as(not null) + n_id.parent = self + for n in n_ids do + assert n isa TId + _n_ids.add(n) + n.parent = self + end + _n_kwdo = n_kwdo + if n_kwdo != null then + n_kwdo.parent = self + end + _n_expr = n_expr + if n_expr != null then + n_expr.parent = self + end + _n_label = n_label + if n_label != null then + n_label.parent = self + end + end + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) + do + if _n_bang == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TBang + _n_bang = new_child + else + abort + end + return + end + if _n_id == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AClosureId + _n_id = new_child + else + abort + end + return + end + for i in [0.._n_ids.length[ do + if _n_ids[i] == old_child then + if new_child != null then + assert new_child isa TId + _n_ids[i] = new_child + new_child.parent = self + else + _n_ids.remove_at(i) + end + return + end end + if _n_kwdo == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwdo + _n_kwdo = new_child + else + _n_kwdo = null + end + return + end + if _n_expr == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa AExpr + _n_expr = new_child + else + _n_expr = null + end + return + end + if _n_label == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa ALabel + _n_label = new_child + else + _n_label = null + end + return + end end - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do - if _n_minuseq != null then - v.visit(_n_minuseq) + v.enter_visit(_n_bang) + v.enter_visit(_n_id) + for n in _n_ids do + v.enter_visit(n) + end + if _n_kwdo != null then + v.enter_visit(_n_kwdo.as(not null)) + end + if _n_expr != null then + v.enter_visit(_n_expr.as(not null)) + end + if _n_label != null then + v.enter_visit(_n_label.as(not null)) end end end -redef class AQualified - redef meth n_classid=(n: TClassid) +redef class ASimpleClosureId + private init empty_init do end + + init init_asimpleclosureid ( + n_id: nullable TId + ) do - _n_classid = n - if n != null then - n.parent = self - end + empty_init + _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 + if new_child != null then + new_child.parent = self + assert new_child isa TId + _n_id = new_child + else + abort + end + return + end end + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_id) + end +end +redef class ABreakClosureId + private init empty_init do end + + init init_abreakclosureid ( + n_kwbreak: nullable TKwbreak + ) + do + empty_init + _n_kwbreak = n_kwbreak.as(not null) + n_kwbreak.parent = self + end + + redef fun replace_child(old_child: ANode, new_child: nullable ANode) + do + if _n_kwbreak == old_child then + if new_child != null then + new_child.parent = self + assert new_child isa TKwbreak + _n_kwbreak = new_child + else + abort + end + return + end + end + + redef fun visit_all(v: Visitor) + do + v.enter_visit(_n_kwbreak) + end +end +redef class AQualified private init empty_init do end init init_aqualified ( - n_id: Array[Object] , # Should be Array[TId] - n_classid: TClassid + n_id: Collection[Object], # Should be Collection[TId] + n_classid: nullable TClassid ) do - _n_id = new List[TId] + empty_init for n in n_id do assert n isa TId _n_id.add(n) @@ -10223,9 +7287,8 @@ redef class AQualified end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_id.length[ do if _n_id[i] == old_child then if new_child != null then @@ -10250,39 +7313,24 @@ redef class AQualified end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_id do - v.visit(n) + v.enter_visit(n) end if _n_classid != null then - v.visit(_n_classid) - end - end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_id.length - while i >= 0 do - v.visit(_n_id[i]) - i = i - 1 - end - end - if _n_classid != null then - v.visit(_n_classid) + v.enter_visit(_n_classid.as(not null)) end end end redef class ADoc - private init empty_init do end init init_adoc ( - n_comment: Array[Object] # Should be Array[TComment] + n_comment: Collection[Object] # Should be Collection[TComment] ) do - _n_comment = new List[TComment] + empty_init for n in n_comment do assert n isa TComment _n_comment.add(n) @@ -10290,9 +7338,8 @@ redef class ADoc end end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null for i in [0.._n_comment.length[ do if _n_comment[i] == old_child then if new_child != null then @@ -10307,42 +7354,30 @@ redef class ADoc end end - redef meth visit_all(v: Visitor) + redef fun visit_all(v: Visitor) do for n in _n_comment do - v.visit(n) + v.enter_visit(n) end end - - redef meth visit_all_reverse(v: Visitor) - do - do - var i = _n_comment.length - while i >= 0 do - v.visit(_n_comment[i]) - i = i - 1 - end - end - end end redef class Start init( - n_base: PModule, + n_base: nullable AModule, n_eof: EOF) do _n_base = n_base _n_eof = n_eof end - redef meth replace_child(old_child: PNode, new_child: PNode) + redef fun replace_child(old_child: ANode, new_child: nullable ANode) do - assert old_child != null if _n_base == old_child then if new_child == null then else new_child.parent = self - assert new_child isa PModule + assert new_child isa AModule _n_base = new_child end old_child.parent = null @@ -10350,17 +7385,11 @@ redef class Start end end - redef meth visit_all(v: Visitor) - do - if _n_base != null then - v.visit(_n_base) - end - end - - redef meth visit_all_reverse(v: Visitor) + redef fun visit_all(v: Visitor) do if _n_base != null then - v.visit(_n_base) + v.enter_visit(_n_base.as(not null)) end + v.enter_visit(_n_eof) end end