Merge: Kill oldstyle attributes

Remove remaining usage of old style attributes declarations `var _foo`.

Also remove the annotation `old_style_init` in the parser.

Pull-Request: #712
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/contrib/pep8analysis/src/parser/lexer.nit b/contrib/pep8analysis/src/parser/lexer.nit
index f1a3c44..f5b910a 100644 (file)
--- a/contrib/pep8analysis/src/parser/lexer.nit
+++ b/contrib/pep8analysis/src/parser/lexer.nit
@@ -6,14 +6,14 @@ intrude import parser_nodes
 private import tables
 
 redef class Token
-    var _text: nullable String
+    var text_cache: nullable String
 
     redef fun text
     do
-        var res = _text
+        var res = _text_cache
         if res != null then return res
         res = location.text
-       _text = res
+       _text_cache = res
        return res
     end
 
@@ -245,7 +245,7 @@ redef class EOF
 
     init(loc: Location)
     do
-        _text = ""
+        _text_cache = ""
                _location = loc
     end
 end
@@ -266,25 +266,25 @@ end
 class Lexer
        super TablesCapable
        # Last peeked token
-       var _token: nullable Token
+       var token: nullable Token
 
        # Lexer current state
-       var _state: Int = 0
+       var state: Int = 0
 
        # The source file
-       var _file: SourceFile
+       var file: SourceFile
 
        # Current character in the stream
-       var _stream_pos: Int = 0
+       var stream_pos: Int = 0
 
        # Current line number in the input stream
-       var _line: Int = 0
+       var line: Int = 0
 
        # Current column in the input stream
-       var _pos: Int = 0
+       var pos: Int = 0
 
        # Was the last character a cariage-return?
-       var _cr: Bool = false
+       var cr: Bool = false
 
        # Constante state values
        private fun state_initial: Int do return 0 end

diff --git a/contrib/pep8analysis/src/parser/parser.nit b/contrib/pep8analysis/src/parser/parser.nit
index 1c6b68f..4fd6be1 100644 (file)
--- a/contrib/pep8analysis/src/parser/parser.nit
+++ b/contrib/pep8analysis/src/parser/parser.nit
@@ -23,13 +23,13 @@ end
 class Parser
        super TablesCapable
        # Associated lexer
-       var _lexer: Lexer
+       var lexer: Lexer
 
        # Stack of pushed states and productions
-       var _stack: Array[State]
+       private var stack: Array[State]
 
        # Position in the stack
-       var _stack_pos: Int
+       private var stack_pos: Int
 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)
@@ -148,10 +148,10 @@ class Parser
                end
        end
 
-       var _reduce_table: Array[ReduceAction]
+       private var reduce_table: Array[ReduceAction]
        private fun build_reduce_table
        do
-               _reduce_table = new Array[ReduceAction].with_items(
+               reduce_table = new Array[ReduceAction].with_items(
                        new ReduceAction0(0),
                        new ReduceAction1(0),
                        new ReduceAction2(0),
@@ -194,11 +194,11 @@ end
 redef class Prod
        # Location on the first token after the start of a production
        # So outside the production for epilon production
-       var _first_location: nullable Location
+       var first_location: nullable Location
 
        # Location of the last token before the end of a production
        # So outside the production for epilon production
-       var _last_location: nullable Location
+       var last_location: nullable Location
 end
 
 # Find location of production nodes
@@ -206,16 +206,16 @@ end
 private class ComputeProdLocationVisitor
        super Visitor
        # Currenlty visited productions that need a first token
-       var _need_first_prods: Array[Prod] = new Array[Prod]
+       var need_first_prods: Array[Prod] = new Array[Prod]
 
        # Already visited epsilon productions that waits something after them
-       var _need_after_epsilons: Array[Prod] = new Array[Prod]
+       var need_after_epsilons: Array[Prod] = new Array[Prod]
 
        # Already visited epsilon production that waits something before them
-       var _need_before_epsilons: Array[Prod] = new Array[Prod]
+       var need_before_epsilons: Array[Prod] = new Array[Prod]
 
        # Location of the last visited token in the current production
-       var _last_location: nullable Location = null
+       var last_location: nullable Location = null
 
        redef fun visit(n: nullable ANode)
        do
@@ -305,7 +305,7 @@ private abstract class ReduceAction
                l1.append(l2)
                return l1
        end
-       var _goto: Int
+       var goto: Int
        init(g: Int) do _goto = g
 end
 

diff --git a/contrib/pep8analysis/src/parser/parser_nodes.nit b/contrib/pep8analysis/src/parser/parser_nodes.nit
index e1fb641..97530a4 100644 (file)
--- a/contrib/pep8analysis/src/parser/parser_nodes.nit
+++ b/contrib/pep8analysis/src/parser/parser_nodes.nit
@@ -1,16 +1,14 @@
 # Raw AST node hierarchy.
 # This file was generated by SableCC (http://www.sablecc.org/).
-module parser_nodes is old_style_init
+module parser_nodes
 
 import location
 
 # Root of the AST hierarchy
 abstract class ANode
-       var _location: nullable Location = null
-
        # Location is set during AST building. Once built, location cannon be null
        # However, manual instanciated nodes may need mode care
-       fun location: Location do return _location.as(not null)
+       var location: Location is writable, noinit
 end
 
 # Ancestor of all tokens
@@ -23,7 +21,6 @@ end
 # Ancestor of all productions
 abstract class Prod
        super ANode
-       fun location=(loc: Location) do _location = loc
 end
 class TEol
        super Token
@@ -81,192 +78,130 @@ class TId
 end
 class EOF
        super Token
-       #private init noinit do end
 end
 class AError
        super EOF
-       #private init noinit do end
 end
 
 class ALine
        super Prod
-       var _n_label_decl: nullable ALabelDecl = null
-       fun n_label_decl: nullable ALabelDecl do return _n_label_decl
-    var _n_comment: nullable TComment = null
-    fun n_comment: nullable TComment do return _n_comment
+       var n_label_decl: nullable ALabelDecl = null
+    var n_comment: nullable TComment = null
 end
 class AInstruction
        super Prod
-    var _n_id: TId
-    fun n_id: TId do return _n_id
-    fun n_id=(n_id: TId) do _n_id = n_id
-       init do end
+    var n_id: TId is noinit
 end
 class AOperand
        super Prod
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_value: AValue is noinit
 end
 class AValue super Prod end
 class ADirective super Prod end
 
 class AListing
        super Prod
-    var _n_lines: List[ALine] = new List[ALine]
-    fun n_lines: List[ALine] do return _n_lines
-    var _n_label_decl: nullable ALabelDecl = null
-    fun n_label_decl: nullable ALabelDecl do return _n_label_decl
-    var _n_end_block: TEndBlock
-    fun n_end_block: TEndBlock do return _n_end_block
-       init do end
+    var n_lines: List[ALine] = new List[ALine]
+    var n_label_decl: nullable ALabelDecl = null
+    var n_end_block: TEndBlock is noinit
 end
 class AEmptyLine
        super ALine
-    var _n_eol: TEol
-    fun n_eol: TEol do return _n_eol
-       init do end
+    var n_eol: TEol is noinit
 end
 abstract class ANonEmptyLine
        super ALine
 end
 class AInstructionLine
        super ANonEmptyLine
-    var _n_instruction: AInstruction
-    fun n_instruction: AInstruction do return _n_instruction
-    var _n_eol: TEol
-    fun n_eol: TEol do return _n_eol
-       init do end
+    var n_instruction: AInstruction is noinit
+    var n_eol: TEol is noinit
 end
 class ADirectiveLine
        super ANonEmptyLine
-    var _n_directive: ADirective
-    fun n_directive: ADirective do return _n_directive
-    var _n_eol: TEol
-    fun n_eol: TEol do return _n_eol
-       init do end
+    var n_directive: ADirective is noinit
+    var n_eol: TEol is noinit
 end
 class ALabelDecl
        super Prod
-    var _n_id: TId
-    fun n_id: TId do return _n_id
-    var _n_colon: TColon
-    fun n_colon: TColon do return _n_colon
-       init do end
+    var n_id: TId is noinit
+    var n_colon: TColon is noinit
 end
 class AUnaryInstruction
        super AInstruction
 end
 class ABinaryInstruction
        super AInstruction
-    var _n_operand: AOperand
-    fun n_operand: AOperand do return _n_operand
-       init do end
+    var n_operand: AOperand is noinit
 end
 class AImmediateOperand
        super AOperand
 end
 class AAnyOperand
        super AOperand
-    var _n_comma: TComma
-    fun n_comma: TComma do return _n_comma
-    var _n_id: TId
-    fun n_id: TId do return _n_id
-       init do end
+    var n_comma: TComma is noinit
+    var n_id: TId is noinit
 end
 class ALabelValue
        super AValue
-    var _n_id: TId
-    fun n_id: TId do return _n_id
-       init do end
+    var n_id: TId is noinit
 end
 class ANumberValue
        super AValue
-    var _n_number: TNumber
-    fun n_number: TNumber do return _n_number
-       init do end
+    var n_number: TNumber is noinit
 end
 class ACharValue
        super AValue
-    var _n_char: TChar
-    fun n_char: TChar do return _n_char
-       init do end
+    var n_char: TChar is noinit
 end
 class AStringValue
        super AValue
-    var _n_string: TString
-    fun n_string: TString do return _n_string
-       init do end
+    var n_string: TString is noinit
 end
 class AHexValue
        super AValue
-    var _n_hex: THex
-    fun n_hex: THex do return _n_hex
-       init do end
+    var n_hex: THex is noinit
 end
 class AByteDirective
        super ADirective
-    var _n_tk_byte: TTkByte
-    fun n_tk_byte: TTkByte do return _n_tk_byte
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_byte: TTkByte is noinit
+    var n_value: AValue is noinit
 end
 class AWordDirective
        super ADirective
-    var _n_tk_word: TTkWord
-    fun n_tk_word: TTkWord do return _n_tk_word
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_word: TTkWord is noinit
+    var n_value: AValue is noinit
 end
 class ABlockDirective
        super ADirective
-    var _n_tk_block: TTkBlock
-    fun n_tk_block: TTkBlock do return _n_tk_block
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_block: TTkBlock is noinit
+    var n_value: AValue is noinit
 end
 class AAsciiDirective
        super ADirective
-    var _n_tk_ascii: TTkAscii
-    fun n_tk_ascii: TTkAscii do return _n_tk_ascii
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_ascii: TTkAscii is noinit
+    var n_value: AValue is noinit
 end
 class AAddrssDirective
        super ADirective
-    var _n_tk_addrss: TTkAddrss
-    fun n_tk_addrss: TTkAddrss do return _n_tk_addrss
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_addrss: TTkAddrss is noinit
+    var n_value: AValue is noinit
 end
 class AEquateDirective
        super ADirective
-    var _n_tk_equate: TTkEquate
-    fun n_tk_equate: TTkEquate do return _n_tk_equate
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_equate: TTkEquate is noinit
+    var n_value: AValue is noinit
 end
 class ABurnDirective
        super ADirective
-    var _n_tk_burn: TTkBurn
-    fun n_tk_burn: TTkBurn do return _n_tk_burn
-    var _n_value: AValue
-    fun n_value: AValue do return _n_value
-       init do end
+    var n_tk_burn: TTkBurn is noinit
+    var n_value: AValue is noinit
 end
 
 class Start
        super Prod
-    var _n_base: nullable AListing
-    fun n_base: nullable AListing do return _n_base
-    var _n_eof: EOF
-    fun n_eof: EOF do return _n_eof
+    var n_base: nullable AListing
+    var n_eof: EOF is noinit
        init(n_base: nullable AListing, n_eof: EOF)
        do
                super

diff --git a/contrib/pep8analysis/src/parser/parser_prod.nit b/contrib/pep8analysis/src/parser/parser_prod.nit
index 8f71631..f7fb2f7 100644 (file)
--- a/contrib/pep8analysis/src/parser/parser_prod.nit
+++ b/contrib/pep8analysis/src/parser/parser_prod.nit
@@ -8,9 +8,7 @@ private import tables
 
 redef class ANode
        # Parent of the node in the AST
-       var _parent: nullable ANode
-       fun parent: nullable ANode do return _parent
-       fun parent=(p: nullable ANode) do _parent = p
+       var parent: nullable ANode is writable
 
        # Remove a child from the AST
        fun remove_child(child: ANode)

diff --git a/contrib/pep8analysis/src/pep8analysis_web.nit b/contrib/pep8analysis/src/pep8analysis_web.nit
index 6167d47..30c0849 100644 (file)
--- a/contrib/pep8analysis/src/pep8analysis_web.nit
+++ b/contrib/pep8analysis/src/pep8analysis_web.nit
@@ -31,6 +31,7 @@ import ast
 import model
 import cfg
 import flow_analysis
+intrude import standard::stream
 
 in "C++" `{
        #include <bind.h>

diff --git a/lib/c.nit b/lib/c.nit
index c0bd650..fdc7e99 100644 (file)
--- a/lib/c.nit
+++ b/lib/c.nit
@@ -16,6 +16,8 @@
 
 # Utilities and performant structure for the FFI with C
 module c
+import standard
+intrude import standard::collection::array
 
 # A thin wrapper around a `NativeCArray` adding length information
 abstract class CArray[E]

diff --git a/lib/dummy_array.nit b/lib/dummy_array.nit
index f939e49..21da4bd 100644 (file)
--- a/lib/dummy_array.nit
+++ b/lib/dummy_array.nit
@@ -13,11 +13,10 @@
 class DummyArray
        super Set[Int]
        super ArrayCapable[Int]
-       var _capacity: Int
-       var _length: Int
-       redef fun length do return _length
-       var _keys: NativeArray[Int]
-       var _values: NativeArray[Int]
+       private var capacity: Int
+       redef var length: Int
+       private var keys: NativeArray[Int]
+       private var values: NativeArray[Int]
 
        redef fun add(value: Int)
        do
@@ -87,8 +86,8 @@ end
 
 class DummyIterator
        super Iterator[Int]
-       var _array: DummyArray
-       var _pos: Int
+       private var array: DummyArray
+       private var pos: Int
 
        redef fun item: Int
        do

diff --git a/lib/filter_stream.nit b/lib/filter_stream.nit
index 32e5728..2797b67 100644 (file)
--- a/lib/filter_stream.nit
+++ b/lib/filter_stream.nit
@@ -38,7 +38,7 @@ end
 
 class StreamCat
        super FilterIStream
-       var _streams: Iterator[IStream]
+       private var streams: Iterator[IStream]
 
        redef fun eof: Bool
        do
@@ -91,7 +91,7 @@ end
 
 class StreamDemux
        super FilterOStream
-       var _streams: Array[OStream]
+       private var streams: Array[OStream]
 
        redef fun is_writable: Bool
        do

diff --git a/lib/hash_debug.nit b/lib/hash_debug.nit
index d25c671..b618729 100644 (file)
--- a/lib/hash_debug.nit
+++ b/lib/hash_debug.nit
@@ -125,7 +125,7 @@ redef class HashCollection[K,N]
        redef fun node_at_idx(i,k)
        do
                sys.gt_count += 1
-               sys.gt_tot_length += _length
+               sys.gt_tot_length += _the_length
                sys.gt_tot_cap += _capacity
                var c = _array[i]
                if c != null and c._next_in_bucklet != null then gt_collide(i,k)
@@ -150,7 +150,7 @@ redef class HashCollection[K,N]
        do
                sys.st_count += 1
                if _array[i] != null then st_collide(i,n)
-               sys.st_tot_length += _length
+               sys.st_tot_length += _the_length
                sys.st_tot_cap += _capacity
 
                super

diff --git a/lib/pnacl.nit b/lib/pnacl.nit
index e9b5407..a76784e 100644 (file)
--- a/lib/pnacl.nit
+++ b/lib/pnacl.nit
@@ -23,6 +23,10 @@
 #
 # Provides PNaCl support for Nit.
 module pnacl is platform
+
+import standard
+intrude import standard::stream
+
 `{
        #include <unistd.h>
        #include <stddef.h>

diff --git a/lib/socket/socket.nit b/lib/socket/socket.nit
index d82e1e5..7dee2ef 100644 (file)
--- a/lib/socket/socket.nit
+++ b/lib/socket/socket.nit
@@ -18,6 +18,7 @@
 module socket
 
 import socket_c
+intrude import standard::stream
 
 # Portal for communication between two machines
 class Socket

diff --git a/lib/standard/collection/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit
index a806c57..9d37e15 100644 (file)
--- a/lib/standard/collection/abstract_collection.nit
+++ b/lib/standard/collection/abstract_collection.nit
@@ -202,7 +202,7 @@ private class ContainerIterator[E]
 
        redef var is_ok: Bool = true
 
-       var _container: Container[E]
+       private var container: Container[E]
 end
 
 # Items can be removed from this collection
@@ -929,7 +929,7 @@ private class CoupleMapIterator[K: Object, E]
                _iter.next
        end
 
-       var _iter: Iterator[Couple[K,E]]
+       private var iter: Iterator[Couple[K,E]]
 
        init(i: Iterator[Couple[K,E]]) do _iter = i
 end

diff --git a/lib/standard/collection/array.nit b/lib/standard/collection/array.nit
index b23f533..61e8700 100644 (file)
--- a/lib/standard/collection/array.nit
+++ b/lib/standard/collection/array.nit
@@ -21,8 +21,7 @@ import abstract_collection
 abstract class AbstractArrayRead[E]
        super SequenceRead[E]
 
-       var _length: Int = 0
-       redef fun length do return _length
+       redef var length = 0
 
        redef fun is_empty do return _length == 0
 
@@ -347,14 +346,14 @@ class Array[E]
        end
 
        # The internal storage.
-       var _items: nullable NativeArray[E] = null
+       private var items: nullable NativeArray[E] = null
 
        # Do not use this method
        # FIXME: Remove it once modules can intrude non local modules
        fun intern_items: NativeArray[E] do return _items.as(not null)
 
        # The size of `_items`.
-       var _capacity: Int = 0
+       private var capacity: Int = 0
 
        redef fun ==(o)
        do
@@ -391,9 +390,9 @@ private class ArrayIterator[E]
                _index = 0
        end
 
-       var _index: Int = 0
-       redef fun index do return _index
-       var _array: AbstractArrayRead[E]
+       redef var index = 0
+
+       private var array: AbstractArrayRead[E]
 end
 
 private class ArrayReverseIterator[E]
@@ -417,7 +416,7 @@ class ArraySet[E: Object]
        super Set[E]
 
        # The stored elements.
-       var _array: Array[E]
+       private var array: Array[E]
 
        redef fun has(e) do return _array.has(e)
 
@@ -475,7 +474,7 @@ private class ArraySetIterator[E: Object]
 
        init(iter: ArrayIterator[E]) do _iter = iter
 
-       var _iter: ArrayIterator[E]
+       private var iter: ArrayIterator[E]
 end
 
 
@@ -531,7 +530,7 @@ class ArrayMap[K: Object, E]
        end
 
        # Internal storage.
-       var _items = new Array[Couple[K,E]]
+       private var items = new Array[Couple[K,E]]
 
        # fast remove the ith element of the array
        private fun remove_at_index(i: Int)
@@ -541,7 +540,7 @@ class ArrayMap[K: Object, E]
        end
 
        # The last positive result given by a index(1) call
-       var _last_index: Int = 0
+       private var last_index: Int = 0
 
        # Where is the `key` in `_item`?
        # return -1 if not found

diff --git a/lib/standard/collection/hash_collection.nit b/lib/standard/collection/hash_collection.nit
index 2def742..7c90189 100644 (file)
--- a/lib/standard/collection/hash_collection.nit
+++ b/lib/standard/collection/hash_collection.nit
@@ -19,18 +19,18 @@ import array
 private abstract class HashCollection[K: Object, N: HashNode[Object]]
        super ArrayCapable[nullable N]
 
-       var _array: nullable NativeArray[nullable N] = null # Used to store items
-       var _capacity: Int = 0 # Size of _array
-       var _length: Int = 0 # Number of items in the map
+       private var array: nullable NativeArray[nullable N] = null # Used to store items
+       private var capacity: Int = 0 # Size of _array
+       private var the_length: Int = 0 # Number of items in the map
 
-       var _first_item: nullable N = null # First added item (used to visit items in nice order)
-       var _last_item: nullable N = null # Last added item (same)
+       private var first_item: nullable N = null # First added item (used to visit items in nice order)
+       private var last_item: nullable N = null # Last added item (same)
 
        # The last key accessed (used for cache)
-       var _last_accessed_key: nullable K = null
+       private var last_accessed_key: nullable K = null
 
        # The last node accessed (used for cache)
-       var _last_accessed_node: nullable N = null
+       private var last_accessed_node: nullable N = null
 
        # Return the index of the key k
        fun index_at(k: K): Int
@@ -89,8 +89,8 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]]
                _last_accessed_node = node
 
                # Enlarge if needed
-               var l = _length
-               _length = l + 1
+               var l = _the_length
+               _the_length = l + 1
 
                # Magic values determined empirically
                # We do not want to enlarge too much
@@ -123,7 +123,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]]
                end
 
                # Remove the item in the array
-               _length -= 1
+               _the_length -= 1
                prev = node._prev_in_bucklet
                next = node._next_in_bucklet
                if prev != null then
@@ -146,7 +146,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]]
                        _array[i] = null
                        i -= 1
                end
-               _length = 0
+               _the_length = 0
                _first_item = null
                _last_item = null
                _last_accessed_key = null
@@ -157,7 +157,7 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]]
        do
                var old_cap = _capacity
                # get a new capacity
-               if cap < _length + 1 then cap = _length + 1
+               if cap < _the_length + 1 then cap = _the_length + 1
                if cap <= _capacity then return
                _capacity = cap
                _last_accessed_key = null
@@ -191,12 +191,12 @@ private abstract class HashCollection[K: Object, N: HashNode[Object]]
 end
 
 private abstract class HashNode[K: Object]
-       var _key: K
+       private var key: K
        type N: HashNode[K]
-       var _next_item: nullable N = null
-       var _prev_item: nullable N = null
-       var _prev_in_bucklet: nullable N = null
-       var _next_in_bucklet: nullable N = null
+       private var next_item: nullable N = null
+       private var prev_item: nullable N = null
+       private var prev_in_bucklet: nullable N = null
+       private var next_in_bucklet: nullable N = null
        init(k: K)
        do
                _key = k
@@ -221,9 +221,9 @@ class HashMap[K: Object, V]
 
        redef fun iterator: HashMapIterator[K, V] do return new HashMapIterator[K,V](self)
 
-       redef fun length do return _length
+       redef fun length do return _the_length
 
-       redef fun is_empty do return _length == 0
+       redef fun is_empty do return _the_length == 0
 
        redef fun []=(key, v)
        do
@@ -242,7 +242,7 @@ class HashMap[K: Object, V]
        init
        do
                _capacity = 0
-               _length = 0
+               _the_length = 0
                enlarge(0)
        end
 
@@ -345,7 +345,7 @@ end
 private class HashMapNode[K: Object, V]
        super HashNode[K]
        redef type N: HashMapNode[K, V]
-       var _value: V
+       private var value: V
 
        init(k: K, v: V)
        do
@@ -383,10 +383,10 @@ class HashMapIterator[K: Object, V]
        end
 
        # The map to iterate on
-       var _map: HashMap[K, V]
+       private var map: HashMap[K, V]
 
        # The current node
-       var _node: nullable HashMapNode[K, V]
+       private var node: nullable HashMapNode[K, V]
 
        init(map: HashMap[K, V])
        do
@@ -401,13 +401,13 @@ class HashSet[E: Object]
        super Set[E]
        super HashCollection[E, HashSetNode[E]]
 
-       redef fun length do return _length
+       redef fun length do return _the_length
 
-       redef fun is_empty do return _length == 0
+       redef fun is_empty do return _the_length == 0
 
        redef fun first
        do
-               assert _length > 0
+               assert _the_length > 0
                return _first_item._key
        end
 
@@ -436,7 +436,7 @@ class HashSet[E: Object]
        init
        do
                _capacity = 0
-               _length = 0
+               _the_length = 0
                enlarge(0)
        end
 
@@ -476,10 +476,10 @@ private class HashSetIterator[E: Object]
        end
 
        # The set to iterate on
-       var _set: HashSet[E]
+       private var set: HashSet[E]
 
        # The position in the internal map storage
-       var _node: nullable HashSetNode[E]
+       private var node: nullable HashSetNode[E]
 
        init(set: HashSet[E])
        do

diff --git a/lib/standard/collection/list.nit b/lib/standard/collection/list.nit
index c5dc5dd..08a8459 100644 (file)
--- a/lib/standard/collection/list.nit
+++ b/lib/standard/collection/list.nit
@@ -210,10 +210,10 @@ class List[E]
        init from(coll: Collection[E]) do append(coll)
 
        # The first node of the list
-       var _head: nullable ListNode[E]
+       private var head: nullable ListNode[E]
 
        # The last node of the list
-       var _tail: nullable ListNode[E]
+       private var tail: nullable ListNode[E]
 
        # Get the `i`th node. get `null` otherwise.
        private fun get_node(i: Int): nullable ListNode[E]
@@ -295,15 +295,13 @@ class ListIterator[E]
        end
 
        # The current list
-       var _list: List[E]
+       private var list: List[E]
 
        # The current node of the list
-       var _node: nullable ListNode[E]
+       private var node: nullable ListNode[E]
 
        # The index of the current node
-       var _index: Int
-
-       redef fun index do return _index
+       redef var index
 
        # Remove the current item
        fun delete

diff --git a/lib/standard/collection/range.nit b/lib/standard/collection/range.nit
index e72771e..31ffaa2 100644 (file)
--- a/lib/standard/collection/range.nit
+++ b/lib/standard/collection/range.nit
@@ -76,9 +76,8 @@ end
 private class IteratorRange[E: Discrete]
        # Iterator on ranges.
        super Iterator[E]
-       var _range: Range[E]
-       var _item: E
-       redef fun item do return _item
+       private var range: Range[E]
+       redef var item
 
        redef fun is_ok do return _item < _range.after
        

diff --git a/lib/standard/file.nit b/lib/standard/file.nit
index f7883f6..3443105 100644 (file)
--- a/lib/standard/file.nit
+++ b/lib/standard/file.nit
@@ -36,7 +36,7 @@ abstract class FStream
        var path: nullable String = null
 
        # The FILE *.
-       var _file: nullable NativeFile = null
+       private var file: nullable NativeFile = null
 
        fun file_stat: FileStat do return _file.file_stat
 
@@ -103,7 +103,7 @@ class OFStream
        
        redef fun write(s)
        do
-               assert _writable
+               assert _is_writable
                if s isa FlatText then
                        write_native(s.to_cstring, s.length)
                else
@@ -111,21 +111,18 @@ class OFStream
                end
        end
 
-       redef fun is_writable do return _writable
-       
        redef fun close
        do
                var i = _file.io_close
-               _writable = false
+               _is_writable = false
        end
 
-       # Is the file open in write mode
-       var _writable: Bool
+       redef var is_writable = false
        
        # Write `len` bytes from `native`.
        private fun write_native(native: NativeString, len: Int)
        do
-               assert _writable
+               assert _is_writable
                var err = _file.io_write(native, len)
                if err != len then
                        # Big problem
@@ -141,7 +138,7 @@ class OFStream
                        print "Error: Opening file at '{path}' failed with '{sys.errno.strerror}'"
                end
                self.path = path
-               _writable = true
+               _is_writable = true
        end
        
        private init do end
@@ -168,7 +165,7 @@ class Stdout
        private init do
                _file = new NativeFile.native_stdout
                path = "/dev/stdout"
-               _writable = true
+               _is_writable = true
        end
 end
 
@@ -177,7 +174,7 @@ class Stderr
        private init do
                _file = new NativeFile.native_stderr
                path = "/dev/stderr"
-               _writable = true
+               _is_writable = true
        end
 end
 

diff --git a/lib/standard/stream.nit b/lib/standard/stream.nit
index d14e82f..5932daa 100644 (file)
--- a/lib/standard/stream.nit
+++ b/lib/standard/stream.nit
@@ -250,10 +250,10 @@ abstract class BufferedIStream
        redef fun eof do return _buffer_pos >= _buffer.length and end_reached
 
        # The buffer
-       var _buffer: nullable FlatBuffer = null
+       private var buffer: nullable FlatBuffer = null
 
        # The current position in the buffer
-       var _buffer_pos: Int = 0
+       private var buffer_pos: Int = 0
 
        # Fill the buffer
        protected fun fill_buffer is abstract

diff --git a/lib/standard/string.nit b/lib/standard/string.nit
index 70cf816..2ae29ef 100644 (file)
--- a/lib/standard/string.nit
+++ b/lib/standard/string.nit
@@ -16,6 +16,7 @@ module string
 
 import math
 import collection
+intrude import collection::array
 
 `{
 #include <stdio.h>
@@ -1968,7 +1969,7 @@ interface StringCapable
 end
 
 redef class Sys
-       var _args_cache: nullable Sequence[String]
+       private var args_cache: nullable Sequence[String]
 
        # The arguments of the program as given by the OS
        fun program_args: Sequence[String]

diff --git a/lib/standard/string_search.nit b/lib/standard/string_search.nit
index ef18e08..95ac9d5 100644 (file)
--- a/lib/standard/string_search.nit
+++ b/lib/standard/string_search.nit
@@ -149,10 +149,10 @@ class BM_Pattern
        end
 
        # searched motif
-       var _motif: String
+       private var motif: String
 
        # length of the motif
-       var _length: Int
+       private var length: Int
 
        private fun bc(e: Char): Int
        do
@@ -164,10 +164,10 @@ class BM_Pattern
        end
 
        # good shifts
-       var _gs: Array[Int]
+       private var gs: Array[Int]
        
        # bad characters
-       var _bc_table: Map[Char, Int]
+       private var bc_table: Map[Char, Int]
 
        private fun compute_bc
        do

diff --git a/lib/string_experimentations/utf8.nit b/lib/string_experimentations/utf8.nit
index 7261820..14f8550 100644 (file)
--- a/lib/string_experimentations/utf8.nit
+++ b/lib/string_experimentations/utf8.nit
@@ -401,7 +401,7 @@ end
 redef class OFStream
        redef fun write(s)
        do
-               assert _writable
+               assert is_writable
                if s isa FlatText then
                        if s isa FlatString then
                                write_native(s.to_cstring, s.bytelen)

diff --git a/lib/string_experimentations/utf8_noindex.nit b/lib/string_experimentations/utf8_noindex.nit
index bf49334..16c2502 100644 (file)
--- a/lib/string_experimentations/utf8_noindex.nit
+++ b/lib/string_experimentations/utf8_noindex.nit
@@ -732,7 +732,7 @@ end
 redef class OFStream
        redef fun write(s)
        do
-               assert _writable
+               assert is_writable
                if s isa FlatText then
                        write_native(s.to_cstring, s.bytelen)
                else for i in s.substrings do write_native(i.to_cstring, i.length)

diff --git a/lib/symbol.nit b/lib/symbol.nit
index d268763..1e9fb67 100644 (file)
--- a/lib/symbol.nit
+++ b/lib/symbol.nit
@@ -31,7 +31,7 @@ end
 
 # A symbol is a unique immutable string
 class Symbol
-       var _string: String
+       private var string: String
        redef fun to_s do return _string.to_s
 
        # Only used by String::to_symbol

diff --git a/lib/websocket.nit b/lib/websocket.nit
index 3179014..201fa92 100644 (file)
--- a/lib/websocket.nit
+++ b/lib/websocket.nit
@@ -22,6 +22,8 @@ import socket
 import sha1
 import base64
 
+intrude import standard::stream
+
 # Websocket compatible server, works as an extra layer to the original Sockets
 class WebSocket
        super BufferedIStream

diff --git a/src/astvalidation.nit b/src/astvalidation.nit
index 578f931..b78632b 100644 (file)
--- a/src/astvalidation.nit
+++ b/src/astvalidation.nit
@@ -51,7 +51,7 @@ redef class ANode
                end
                v.seen.add(self)
 
-               if _location == null then
+               if not isset _location then
                        #debug "LOCATION: unlocated node {v.path.join(", ")}"
                        _location = self.parent.location
                end

diff --git a/src/parser/lexer_work.nit b/src/parser/lexer_work.nit
index 1c626b8..e7102b6 100644 (file)
--- a/src/parser/lexer_work.nit
+++ b/src/parser/lexer_work.nit
@@ -19,20 +19,20 @@ intrude import parser_nodes
 private import tables
 
 redef class Token
-    var _text: nullable String
+    private var cached_text: nullable String
 
     redef fun text
     do
-        var res = _text
+        var res = _cached_text
         if res != null then return res
         res = location.text
-       _text = res
+       _cached_text = res
        return res
     end
 
     redef fun text=(text)
     do
-        _text = text
+        _cached_text = text
     end
 
     fun parser_index: Int is abstract
@@ -46,7 +46,7 @@ redef class EOF
 
     init init_tk(loc: Location)
     do
-        _text = ""
+        _cached_text = ""
                _location = loc
     end
 end
@@ -86,25 +86,25 @@ end
 class Lexer
        super TablesCapable
        # Last peeked token
-       var _token: nullable Token
+       var token: nullable Token
 
        # Lexer current state
-       var _state: Int = 0
+       private var state: Int = 0
 
        # The source file
        var file: SourceFile
 
        # Current character in the stream
-       var _stream_pos: Int = 0
+       var stream_pos: Int = 0
 
        # Current line number in the input stream
-       var _line: Int = 0
+       var line: Int = 0
 
        # Current column in the input stream
-       var _pos: Int = 0
+       var pos: Int = 0
 
        # Was the last character a cariage-return?
-       var _cr: Bool = false
+       var cr: Bool = false
 
        # Constante state values
        private fun state_initial: Int do return 0 end
@@ -127,7 +127,7 @@ class Lexer
                t = get_token
                while t == null do t = get_token
 
-               if t._location != null then
+               if isset t._location then
                        var l = last_token
                        if l != null then
                                l.next_token = t

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index 5cf40bd..d10c615 100644 (file)
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -340,114 +340,62 @@ class AAtid super Prod end
 
 class AModule
        super AModule
-       var _n_moduledecl: nullable AModuledecl = null
-       fun n_moduledecl: nullable AModuledecl do return _n_moduledecl
-       fun n_moduledecl=(n_moduledecl: nullable AModuledecl) do _n_moduledecl = n_moduledecl
+       var n_moduledecl: nullable AModuledecl = null is writable
        var n_imports: List[AImport] = new List[AImport]
        var n_extern_code_blocks: List[AExternCodeBlock] = new List[AExternCodeBlock]
        var n_classdefs: List[AClassdef] = new List[AClassdef]
 end
 class AModuledecl
        super AModuledecl
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmodule: TKwmodule = null
-       fun n_kwmodule: TKwmodule do return _n_kwmodule
-       fun n_kwmodule=(n_kwmodule: TKwmodule) do _n_kwmodule = n_kwmodule
-       var _n_name: AModuleName = null
-       fun n_name: AModuleName do return _n_name
-       fun n_name=(n_name: AModuleName) do _n_name = n_name
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmodule: TKwmodule is writable, noinit
+       var n_name: AModuleName is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AStdImport
        super AImport
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwimport: TKwimport = null
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
-       var _n_name: AModuleName = null
-       fun n_name: AModuleName do return _n_name
-       fun n_name=(n_name: AModuleName) do _n_name = n_name
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwimport: TKwimport is writable, noinit
+       var n_name: AModuleName is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ANoImport
        super AImport
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwimport: TKwimport = null
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
-       var _n_kwend: TKwend = null
-       fun n_kwend: TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: TKwend) do _n_kwend = n_kwend
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwimport: TKwimport is writable, noinit
+       var n_kwend: TKwend is writable, noinit
 end
 class APublicVisibility
        super AVisibility
-       var _n_kwpublic: nullable TKwpublic = null
-       fun n_kwpublic: nullable TKwpublic do return _n_kwpublic
-       fun n_kwpublic=(n_kwpublic: nullable TKwpublic) do _n_kwpublic = n_kwpublic
+       var n_kwpublic: nullable TKwpublic = null is writable
 end
 class APrivateVisibility
        super AVisibility
-       var _n_kwprivate: TKwprivate = null
-       fun n_kwprivate: TKwprivate do return _n_kwprivate
-       fun n_kwprivate=(n_kwprivate: TKwprivate) do _n_kwprivate = n_kwprivate
+       var n_kwprivate: TKwprivate is writable, noinit
 end
 class AProtectedVisibility
        super AVisibility
-       var _n_kwprotected: TKwprotected = null
-       fun n_kwprotected: TKwprotected do return _n_kwprotected
-       fun n_kwprotected=(n_kwprotected: TKwprotected) do _n_kwprotected = n_kwprotected
+       var n_kwprotected: TKwprotected is writable, noinit
 end
 class AIntrudeVisibility
        super AVisibility
-       var _n_kwintrude: TKwintrude = null
-       fun n_kwintrude: TKwintrude do return _n_kwintrude
-       fun n_kwintrude=(n_kwintrude: TKwintrude) do _n_kwintrude = n_kwintrude
+       var n_kwintrude: TKwintrude is writable, noinit
 end
 class AStdClassdef
        super AClassdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_classkind: AClasskind = null
-       fun n_classkind: AClasskind do return _n_classkind
-       fun n_classkind=(n_classkind: AClasskind) do _n_classkind = n_classkind
-       var _n_id: nullable TClassid = null
-       fun n_id: nullable TClassid do return _n_id
-       fun n_id=(n_id: nullable TClassid) do _n_id = n_id
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_classkind: AClasskind is writable, noinit
+       var n_id: nullable TClassid = null is writable
        var n_formaldefs: List[AFormaldef] = new List[AFormaldef]
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_extern_code_block: nullable AExternCodeBlock = null
-       fun n_extern_code_block: nullable AExternCodeBlock do return _n_extern_code_block
-       fun n_extern_code_block=(n_extern_code_block: nullable AExternCodeBlock) do _n_extern_code_block = n_extern_code_block
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_extern_code_block: nullable AExternCodeBlock = null is writable
        var n_superclasses: List[ASuperclass] = new List[ASuperclass]
        var n_propdefs: List[APropdef] = new List[APropdef]
-       var _n_kwend: TKwend = null
-       fun n_kwend: TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: TKwend) do _n_kwend = n_kwend
+       var n_kwend: TKwend is writable, noinit
 end
 class ATopClassdef
        super AClassdef
@@ -459,1364 +407,696 @@ class AMainClassdef
 end
 class AConcreteClasskind
        super AClasskind
-       var _n_kwclass: TKwclass = null
-       fun n_kwclass: TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: TKwclass) do _n_kwclass = n_kwclass
+       var n_kwclass: TKwclass is writable, noinit
 end
 class AAbstractClasskind
        super AClasskind
-       var _n_kwabstract: TKwabstract = null
-       fun n_kwabstract: TKwabstract do return _n_kwabstract
-       fun n_kwabstract=(n_kwabstract: TKwabstract) do _n_kwabstract = n_kwabstract
-       var _n_kwclass: TKwclass = null
-       fun n_kwclass: TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: TKwclass) do _n_kwclass = n_kwclass
+       var n_kwabstract: TKwabstract is writable, noinit
+       var n_kwclass: TKwclass is writable, noinit
 end
 class AInterfaceClasskind
        super AClasskind
-       var _n_kwinterface: TKwinterface = null
-       fun n_kwinterface: TKwinterface do return _n_kwinterface
-       fun n_kwinterface=(n_kwinterface: TKwinterface) do _n_kwinterface = n_kwinterface
+       var n_kwinterface: TKwinterface is writable, noinit
 end
 class AEnumClasskind
        super AClasskind
-       var _n_kwenum: TKwenum = null
-       fun n_kwenum: TKwenum do return _n_kwenum
-       fun n_kwenum=(n_kwenum: TKwenum) do _n_kwenum = n_kwenum
+       var n_kwenum: TKwenum is writable, noinit
 end
 class AExternClasskind
        super AClasskind
-       var _n_kwextern: TKwextern = null
-       fun n_kwextern: TKwextern do return _n_kwextern
-       fun n_kwextern=(n_kwextern: TKwextern) do _n_kwextern = n_kwextern
-       var _n_kwclass: nullable TKwclass = null
-       fun n_kwclass: nullable TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: nullable TKwclass) do _n_kwclass = n_kwclass
+       var n_kwextern: TKwextern is writable, noinit
+       var n_kwclass: nullable TKwclass = null is writable
 end
 class AFormaldef
        super AFormaldef
-       var _n_id: TClassid = null
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_id: TClassid is writable, noinit
+       var n_type: nullable AType = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ASuperclass
        super ASuperclass
-       var _n_kwsuper: TKwsuper = null
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwsuper: TKwsuper is writable, noinit
+       var n_type: AType is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AAttrPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_readable: nullable AAble = null
-       fun n_readable: nullable AAble do return _n_readable
-       fun n_readable=(n_readable: nullable AAble) do _n_readable = n_readable
-       var _n_writable: nullable AAble = null
-       fun n_writable: nullable AAble do return _n_writable
-       fun n_writable=(n_writable: nullable AAble) do _n_writable = n_writable
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwvar: TKwvar = null
-       fun n_kwvar: TKwvar do return _n_kwvar
-       fun n_kwvar=(n_kwvar: TKwvar) do _n_kwvar = n_kwvar
-       var _n_id: nullable TAttrid = null
-       fun n_id: nullable TAttrid do return _n_id
-       fun n_id=(n_id: nullable TAttrid) do _n_id = n_id
-       var _n_id2: nullable TId = null
-       fun n_id2: nullable TId do return _n_id2
-       fun n_id2=(n_id2: nullable TId) do _n_id2 = n_id2
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
+       var n_doc: nullable ADoc = null is writable
+       var n_readable: nullable AAble = null is writable
+       var n_writable: nullable AAble = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwvar: TKwvar is writable, noinit
+       var n_id: nullable TAttrid = null is writable
+       var n_id2: nullable TId = null is writable
+       var n_type: nullable AType = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_expr: nullable AExpr = null is writable
 end
 class AMethPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_methid: AMethid is writable, noinit
+       var n_signature: ASignature is writable, noinit
 end
 class ADeferredMethPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmeth: TKwmeth = null
-       fun n_kwmeth: TKwmeth do return _n_kwmeth
-       fun n_kwmeth=(n_kwmeth: TKwmeth) do _n_kwmeth = n_kwmeth
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmeth: TKwmeth is writable, noinit
+       var n_methid: AMethid is writable, noinit
+       var n_signature: ASignature is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AInternMethPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmeth: TKwmeth = null
-       fun n_kwmeth: TKwmeth do return _n_kwmeth
-       fun n_kwmeth=(n_kwmeth: TKwmeth) do _n_kwmeth = n_kwmeth
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmeth: TKwmeth is writable, noinit
+       var n_methid: AMethid is writable, noinit
+       var n_signature: ASignature is writable, noinit
 end
 class AInternNewPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwnew: TKwnew = null
-       fun n_kwnew: TKwnew do return _n_kwnew
-       fun n_kwnew=(n_kwnew: TKwnew) do _n_kwnew = n_kwnew
-       var _n_methid: nullable AMethid = null
-       fun n_methid: nullable AMethid do return _n_methid
-       fun n_methid=(n_methid: nullable AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwnew: TKwnew is writable, noinit
+       var n_methid: nullable AMethid = null is writable
+       var n_signature: ASignature is writable, noinit
 end
 class AExternMethPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmeth: TKwmeth = null
-       fun n_kwmeth: TKwmeth do return _n_kwmeth
-       fun n_kwmeth=(n_kwmeth: TKwmeth) do _n_kwmeth = n_kwmeth
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_extern: nullable TString = null
-       fun n_extern: nullable TString do return _n_extern
-       fun n_extern=(n_extern: nullable TString) do _n_extern = n_extern
-       var _n_extern_calls: nullable AExternCalls = null
-       fun n_extern_calls: nullable AExternCalls do return _n_extern_calls
-       fun n_extern_calls=(n_extern_calls: nullable AExternCalls) do _n_extern_calls = n_extern_calls
-       var _n_extern_code_block: nullable AExternCodeBlock = null
-       fun n_extern_code_block: nullable AExternCodeBlock do return _n_extern_code_block
-       fun n_extern_code_block=(n_extern_code_block: nullable AExternCodeBlock) do _n_extern_code_block = n_extern_code_block
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmeth: TKwmeth is writable, noinit
+       var n_methid: AMethid is writable, noinit
+       var n_signature: ASignature is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_extern: nullable TString = null is writable
+       var n_extern_calls: nullable AExternCalls = null is writable
+       var n_extern_code_block: nullable AExternCodeBlock = null is writable
 end
 class AConcreteMethPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmeth: TKwmeth = null
-       fun n_kwmeth: TKwmeth do return _n_kwmeth
-       fun n_kwmeth=(n_kwmeth: TKwmeth) do _n_kwmeth = n_kwmeth
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmeth: TKwmeth is writable, noinit
+       var n_methid: AMethid is writable, noinit
+       var n_signature: ASignature is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_block: nullable AExpr = null is writable
 end
 class AConcreteInitPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwinit: TKwinit = null
-       fun n_kwinit: TKwinit do return _n_kwinit
-       fun n_kwinit=(n_kwinit: TKwinit) do _n_kwinit = n_kwinit
-       var _n_methid: nullable AMethid = null
-       fun n_methid: nullable AMethid do return _n_methid
-       fun n_methid=(n_methid: nullable AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwinit: TKwinit is writable, noinit
+       var n_methid: nullable AMethid = null is writable
+       var n_signature: ASignature is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_block: nullable AExpr = null is writable
 end
 class AExternInitPropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwnew: TKwnew = null
-       fun n_kwnew: TKwnew do return _n_kwnew
-       fun n_kwnew=(n_kwnew: TKwnew) do _n_kwnew = n_kwnew
-       var _n_methid: nullable AMethid = null
-       fun n_methid: nullable AMethid do return _n_methid
-       fun n_methid=(n_methid: nullable AMethid) do _n_methid = n_methid
-       var _n_signature: ASignature = null
-       fun n_signature: ASignature do return _n_signature
-       fun n_signature=(n_signature: ASignature) do _n_signature = n_signature
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
-       var _n_extern: nullable TString = null
-       fun n_extern: nullable TString do return _n_extern
-       fun n_extern=(n_extern: nullable TString) do _n_extern = n_extern
-       var _n_extern_calls: nullable AExternCalls = null
-       fun n_extern_calls: nullable AExternCalls do return _n_extern_calls
-       fun n_extern_calls=(n_extern_calls: nullable AExternCalls) do _n_extern_calls = n_extern_calls
-       var _n_extern_code_block: nullable AExternCodeBlock = null
-       fun n_extern_code_block: nullable AExternCodeBlock do return _n_extern_code_block
-       fun n_extern_code_block=(n_extern_code_block: nullable AExternCodeBlock) do _n_extern_code_block = n_extern_code_block
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwnew: TKwnew is writable, noinit
+       var n_methid: nullable AMethid = null is writable
+       var n_signature: ASignature is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
+       var n_extern: nullable TString = null is writable
+       var n_extern_calls: nullable AExternCalls = null is writable
+       var n_extern_code_block: nullable AExternCodeBlock = null is writable
 end
 class AMainMethPropdef
        super APropdef
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_block: nullable AExpr = null is writable
 end
 class ATypePropdef
        super APropdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility = null
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwtype: TKwtype = null
-       fun n_kwtype: TKwtype do return _n_kwtype
-       fun n_kwtype=(n_kwtype: TKwtype) do _n_kwtype = n_kwtype
-       var _n_id: TClassid = null
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwtype: TKwtype is writable, noinit
+       var n_id: TClassid is writable, noinit
+       var n_type: AType is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AReadAble
        super AAble
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_kwreadable: TKwreadable = null
-       fun n_kwreadable: TKwreadable do return _n_kwreadable
-       fun n_kwreadable=(n_kwreadable: TKwreadable) do _n_kwreadable = n_kwreadable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_kwreadable: TKwreadable is writable, noinit
 end
 class AWriteAble
        super AAble
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: nullable AVisibility = null
-       fun n_visibility: nullable AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: nullable AVisibility) do _n_visibility = n_visibility
-       var _n_kwwritable: TKwwritable = null
-       fun n_kwwritable: TKwwritable do return _n_kwwritable
-       fun n_kwwritable=(n_kwwritable: TKwwritable) do _n_kwwritable = n_kwwritable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: nullable AVisibility = null is writable
+       var n_kwwritable: TKwwritable is writable, noinit
 end
 class AIdMethid
        super AMethid
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
+       var n_id: TId is writable, noinit
 end
 class APlusMethid
        super AMethid
-       var _n_plus: TPlus = null
-       fun n_plus: TPlus do return _n_plus
-       fun n_plus=(n_plus: TPlus) do _n_plus = n_plus
+       var n_plus: TPlus is writable, noinit
 end
 class AMinusMethid
        super AMethid
-       var _n_minus: TMinus = null
-       fun n_minus: TMinus do return _n_minus
-       fun n_minus=(n_minus: TMinus) do _n_minus = n_minus
+       var n_minus: TMinus is writable, noinit
 end
 class AStarMethid
        super AMethid
-       var _n_star: TStar = null
-       fun n_star: TStar do return _n_star
-       fun n_star=(n_star: TStar) do _n_star = n_star
+       var n_star: TStar is writable, noinit
 end
 class ASlashMethid
        super AMethid
-       var _n_slash: TSlash = null
-       fun n_slash: TSlash do return _n_slash
-       fun n_slash=(n_slash: TSlash) do _n_slash = n_slash
+       var n_slash: TSlash is writable, noinit
 end
 class APercentMethid
        super AMethid
-       var _n_percent: TPercent = null
-       fun n_percent: TPercent do return _n_percent
-       fun n_percent=(n_percent: TPercent) do _n_percent = n_percent
+       var n_percent: TPercent is writable, noinit
 end
 class AEqMethid
        super AMethid
-       var _n_eq: TEq = null
-       fun n_eq: TEq do return _n_eq
-       fun n_eq=(n_eq: TEq) do _n_eq = n_eq
+       var n_eq: TEq is writable, noinit
 end
 class ANeMethid
        super AMethid
-       var _n_ne: TNe = null
-       fun n_ne: TNe do return _n_ne
-       fun n_ne=(n_ne: TNe) do _n_ne = n_ne
+       var n_ne: TNe is writable, noinit
 end
 class ALeMethid
        super AMethid
-       var _n_le: TLe = null
-       fun n_le: TLe do return _n_le
-       fun n_le=(n_le: TLe) do _n_le = n_le
+       var n_le: TLe is writable, noinit
 end
 class AGeMethid
        super AMethid
-       var _n_ge: TGe = null
-       fun n_ge: TGe do return _n_ge
-       fun n_ge=(n_ge: TGe) do _n_ge = n_ge
+       var n_ge: TGe is writable, noinit
 end
 class ALtMethid
        super AMethid
-       var _n_lt: TLt = null
-       fun n_lt: TLt do return _n_lt
-       fun n_lt=(n_lt: TLt) do _n_lt = n_lt
+       var n_lt: TLt is writable, noinit
 end
 class AGtMethid
        super AMethid
-       var _n_gt: TGt = null
-       fun n_gt: TGt do return _n_gt
-       fun n_gt=(n_gt: TGt) do _n_gt = n_gt
+       var n_gt: TGt is writable, noinit
 end
 class ALlMethid
        super AMethid
-       var _n_ll: TLl = null
-       fun n_ll: TLl do return _n_ll
-       fun n_ll=(n_ll: TLl) do _n_ll = n_ll
+       var n_ll: TLl is writable, noinit
 end
 class AGgMethid
        super AMethid
-       var _n_gg: TGg = null
-       fun n_gg: TGg do return _n_gg
-       fun n_gg=(n_gg: TGg) do _n_gg = n_gg
+       var n_gg: TGg is writable, noinit
 end
 class ABraMethid
        super AMethid
-       var _n_obra: TObra = null
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra = null
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
 end
 class AStarshipMethid
        super AMethid
-       var _n_starship: TStarship = null
-       fun n_starship: TStarship do return _n_starship
-       fun n_starship=(n_starship: TStarship) do _n_starship = n_starship
+       var n_starship: TStarship is writable, noinit
 end
 class AAssignMethid
        super AMethid
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
+       var n_id: TId is writable, noinit
+       var n_assign: TAssign is writable, noinit
 end
 class ABraassignMethid
        super AMethid
-       var _n_obra: TObra = null
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra = null
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
+       var n_assign: TAssign is writable, noinit
 end
 class ASignature
        super ASignature
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_opar: nullable TOpar = null is writable
        var n_params: List[AParam] = new List[AParam]
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
+       var n_cpar: nullable TCpar = null is writable
+       var n_type: nullable AType = null is writable
 end
 class AParam
        super AParam
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_dotdotdot: nullable TDotdotdot = null
-       fun n_dotdotdot: nullable TDotdotdot do return _n_dotdotdot
-       fun n_dotdotdot=(n_dotdotdot: nullable TDotdotdot) do _n_dotdotdot = n_dotdotdot
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_id: TId is writable, noinit
+       var n_type: nullable AType = null is writable
+       var n_dotdotdot: nullable TDotdotdot = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AType
        super AType
-       var _n_kwnullable: nullable TKwnullable = null
-       fun n_kwnullable: nullable TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: nullable TKwnullable) do _n_kwnullable = n_kwnullable
-       var _n_id: TClassid = null
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
+       var n_kwnullable: nullable TKwnullable = null is writable
+       var n_id: TClassid is writable, noinit
        var n_types: List[AType] = new List[AType]
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ALabel
        super ALabel
-       var _n_kwlabel: TKwlabel = null
-       fun n_kwlabel: TKwlabel do return _n_kwlabel
-       fun n_kwlabel=(n_kwlabel: TKwlabel) do _n_kwlabel = n_kwlabel
-       var _n_id: nullable TId = null
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
+       var n_kwlabel: TKwlabel is writable, noinit
+       var n_id: nullable TId = null is writable
 end
 class ABlockExpr
        super AExpr
        var n_expr: List[AExpr] = new List[AExpr]
-       var _n_kwend: nullable TKwend = null
-       fun n_kwend: nullable TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: nullable TKwend) do _n_kwend = n_kwend
+       var n_kwend: nullable TKwend = null is writable
 end
 class AVardeclExpr
        super AExpr
-       var _n_kwvar: TKwvar = null
-       fun n_kwvar: TKwvar do return _n_kwvar
-       fun n_kwvar=(n_kwvar: TKwvar) do _n_kwvar = n_kwvar
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_assign: nullable TAssign = null
-       fun n_assign: nullable TAssign do return _n_assign
-       fun n_assign=(n_assign: nullable TAssign) do _n_assign = n_assign
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwvar: TKwvar is writable, noinit
+       var n_id: TId is writable, noinit
+       var n_type: nullable AType = null is writable
+       var n_assign: nullable TAssign = null is writable
+       var n_expr: nullable AExpr = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AReturnExpr
        super AExpr
-       var _n_kwreturn: nullable TKwreturn = null
-       fun n_kwreturn: nullable TKwreturn do return _n_kwreturn
-       fun n_kwreturn=(n_kwreturn: nullable TKwreturn) do _n_kwreturn = n_kwreturn
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
+       var n_kwreturn: nullable TKwreturn = null is writable
+       var n_expr: nullable AExpr = null is writable
 end
 class ABreakExpr
        super AExpr
-       var _n_kwbreak: TKwbreak = null
-       fun n_kwbreak: TKwbreak do return _n_kwbreak
-       fun n_kwbreak=(n_kwbreak: TKwbreak) do _n_kwbreak = n_kwbreak
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_kwbreak: TKwbreak is writable, noinit
+       var n_label: nullable ALabel = null is writable
 end
 class AAbortExpr
        super AExpr
-       var _n_kwabort: TKwabort = null
-       fun n_kwabort: TKwabort do return _n_kwabort
-       fun n_kwabort=(n_kwabort: TKwabort) do _n_kwabort = n_kwabort
+       var n_kwabort: TKwabort is writable, noinit
 end
 class AContinueExpr
        super AExpr
-       var _n_kwcontinue: nullable TKwcontinue = null
-       fun n_kwcontinue: nullable TKwcontinue do return _n_kwcontinue
-       fun n_kwcontinue=(n_kwcontinue: nullable TKwcontinue) do _n_kwcontinue = n_kwcontinue
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_kwcontinue: nullable TKwcontinue = null is writable
+       var n_label: nullable ALabel = null is writable
 end
 class ADoExpr
        super AExpr
-       var _n_kwdo: TKwdo = null
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
+       var n_label: nullable ALabel = null is writable
 end
 class AIfExpr
        super AExpr
-       var _n_kwif: TKwif = null
-       fun n_kwif: TKwif do return _n_kwif
-       fun n_kwif=(n_kwif: TKwif) do _n_kwif = n_kwif
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_then: nullable AExpr = null
-       fun n_then: nullable AExpr do return _n_then
-       fun n_then=(n_then: nullable AExpr) do _n_then = n_then
-       var _n_else: nullable AExpr = null
-       fun n_else: nullable AExpr do return _n_else
-       fun n_else=(n_else: nullable AExpr) do _n_else = n_else
+       var n_kwif: TKwif is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_then: nullable AExpr = null is writable
+       var n_else: nullable AExpr = null is writable
 end
 class AIfexprExpr
        super AExpr
-       var _n_kwif: TKwif = null
-       fun n_kwif: TKwif do return _n_kwif
-       fun n_kwif=(n_kwif: TKwif) do _n_kwif = n_kwif
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwthen: TKwthen = null
-       fun n_kwthen: TKwthen do return _n_kwthen
-       fun n_kwthen=(n_kwthen: TKwthen) do _n_kwthen = n_kwthen
-       var _n_then: AExpr = null
-       fun n_then: AExpr do return _n_then
-       fun n_then=(n_then: AExpr) do _n_then = n_then
-       var _n_kwelse: TKwelse = null
-       fun n_kwelse: TKwelse do return _n_kwelse
-       fun n_kwelse=(n_kwelse: TKwelse) do _n_kwelse = n_kwelse
-       var _n_else: AExpr = null
-       fun n_else: AExpr do return _n_else
-       fun n_else=(n_else: AExpr) do _n_else = n_else
+       var n_kwif: TKwif is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_kwthen: TKwthen is writable, noinit
+       var n_then: AExpr is writable, noinit
+       var n_kwelse: TKwelse is writable, noinit
+       var n_else: AExpr is writable, noinit
 end
 class AWhileExpr
        super AExpr
-       var _n_kwwhile: TKwwhile = null
-       fun n_kwwhile: TKwwhile do return _n_kwwhile
-       fun n_kwwhile=(n_kwwhile: TKwwhile) do _n_kwwhile = n_kwwhile
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwdo: TKwdo = null
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_kwwhile: TKwwhile is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
+       var n_label: nullable ALabel = null is writable
 end
 class ALoopExpr
        super AExpr
-       var _n_kwloop: TKwloop = null
-       fun n_kwloop: TKwloop do return _n_kwloop
-       fun n_kwloop=(n_kwloop: TKwloop) do _n_kwloop = n_kwloop
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_kwloop: TKwloop is writable, noinit
+       var n_block: nullable AExpr = null is writable
+       var n_label: nullable ALabel = null is writable
 end
 class AForExpr
        super AExpr
-       var _n_kwfor: TKwfor = null
-       fun n_kwfor: TKwfor do return _n_kwfor
-       fun n_kwfor=(n_kwfor: TKwfor) do _n_kwfor = n_kwfor
+       var n_kwfor: TKwfor is writable, noinit
        var n_ids: List[TId] = new List[TId]
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwdo: TKwdo = null
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
+       var n_expr: AExpr is writable, noinit
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
+       var n_label: nullable ALabel = null is writable
 end
 class AAssertExpr
        super AExpr
-       var _n_kwassert: TKwassert = null
-       fun n_kwassert: TKwassert do return _n_kwassert
-       fun n_kwassert=(n_kwassert: TKwassert) do _n_kwassert = n_kwassert
-       var _n_id: nullable TId = null
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_else: nullable AExpr = null
-       fun n_else: nullable AExpr do return _n_else
-       fun n_else=(n_else: nullable AExpr) do _n_else = n_else
+       var n_kwassert: TKwassert is writable, noinit
+       var n_id: nullable TId = null is writable
+       var n_expr: AExpr is writable, noinit
+       var n_else: nullable AExpr = null is writable
 end
 class AOnceExpr
        super AExpr
-       var _n_kwonce: TKwonce = null
-       fun n_kwonce: TKwonce do return _n_kwonce
-       fun n_kwonce=(n_kwonce: TKwonce) do _n_kwonce = n_kwonce
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_kwonce: TKwonce is writable, noinit
+       var n_expr: AExpr is writable, noinit
 end
 class ASendExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_expr: AExpr is writable, noinit
 end
 class ABinopExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AOrExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AAndExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AOrElseExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AImpliesExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ANotExpr
        super AExpr
-       var _n_kwnot: TKwnot = null
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_kwnot: TKwnot is writable, noinit
+       var n_expr: AExpr is writable, noinit
 end
 class AEqExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ANeExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ALtExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ALeExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ALlExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AGtExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AGeExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AGgExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AIsaExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
+       var n_expr: AExpr is writable, noinit
+       var n_type: AType is writable, noinit
 end
 class APlusExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AMinusExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AStarshipExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AStarExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class ASlashExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class APercentExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 class AUminusExpr
        super AExpr
-       var _n_minus: TMinus = null
-       fun n_minus: TMinus do return _n_minus
-       fun n_minus=(n_minus: TMinus) do _n_minus = n_minus
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_minus: TMinus is writable, noinit
+       var n_expr: AExpr is writable, noinit
 end
 class ANewExpr
        super AExpr
-       var _n_kwnew: TKwnew = null
-       fun n_kwnew: TKwnew do return _n_kwnew
-       fun n_kwnew=(n_kwnew: TKwnew) do _n_kwnew = n_kwnew
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_id: nullable TId = null
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
+       var n_kwnew: TKwnew is writable, noinit
+       var n_type: AType is writable, noinit
+       var n_id: nullable TId = null is writable
+       var n_args: AExprs is writable, noinit
 end
 class AAttrExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TAttrid = null
-       fun n_id: TAttrid do return _n_id
-       fun n_id=(n_id: TAttrid) do _n_id = n_id
+       var n_expr: AExpr is writable, noinit
+       var n_id: TAttrid is writable, noinit
 end
 class AAttrAssignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TAttrid = null
-       fun n_id: TAttrid do return _n_id
-       fun n_id=(n_id: TAttrid) do _n_id = n_id
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_id: TAttrid is writable, noinit
+       var n_assign: TAssign is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class AAttrReassignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TAttrid = null
-       fun n_id: TAttrid do return _n_id
-       fun n_id=(n_id: TAttrid) do _n_id = n_id
-       var _n_assign_op: AAssignOp = null
-       fun n_assign_op: AAssignOp do return _n_assign_op
-       fun n_assign_op=(n_assign_op: AAssignOp) do _n_assign_op = n_assign_op
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_id: TAttrid is writable, noinit
+       var n_assign_op: AAssignOp is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class ACallExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
+       var n_expr: AExpr is writable, noinit
+       var n_id: TId is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 class ACallAssignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_id: TId is writable, noinit
+       var n_args: AExprs is writable, noinit
+       var n_assign: TAssign is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class ACallReassignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       var _n_assign_op: AAssignOp = null
-       fun n_assign_op: AAssignOp do return _n_assign_op
-       fun n_assign_op=(n_assign_op: AAssignOp) do _n_assign_op = n_assign_op
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_id: TId is writable, noinit
+       var n_args: AExprs is writable, noinit
+       var n_assign_op: AAssignOp is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class ASuperExpr
        super AExpr
-       var _n_qualified: nullable AQualified = null
-       fun n_qualified: nullable AQualified do return _n_qualified
-       fun n_qualified=(n_qualified: nullable AQualified) do _n_qualified = n_qualified
-       var _n_kwsuper: TKwsuper = null
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
+       var n_qualified: nullable AQualified = null is writable
+       var n_kwsuper: TKwsuper is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 class AInitExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwinit: TKwinit = null
-       fun n_kwinit: TKwinit do return _n_kwinit
-       fun n_kwinit=(n_kwinit: TKwinit) do _n_kwinit = n_kwinit
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
+       var n_expr: AExpr is writable, noinit
+       var n_kwinit: TKwinit is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 class ABraExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
+       var n_expr: AExpr is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 class ABraAssignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_args: AExprs is writable, noinit
+       var n_assign: TAssign is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class ABraReassignExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_args: AExprs = null
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       var _n_assign_op: AAssignOp = null
-       fun n_assign_op: AAssignOp do return _n_assign_op
-       fun n_assign_op=(n_assign_op: AAssignOp) do _n_assign_op = n_assign_op
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_expr: AExpr is writable, noinit
+       var n_args: AExprs is writable, noinit
+       var n_assign_op: AAssignOp is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class AVarExpr
        super AExpr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
+       var n_id: TId is writable, noinit
 end
 class AVarAssignExpr
        super AExpr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_assign: TAssign = null
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_id: TId is writable, noinit
+       var n_assign: TAssign is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class AVarReassignExpr
        super AExpr
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_assign_op: AAssignOp = null
-       fun n_assign_op: AAssignOp do return _n_assign_op
-       fun n_assign_op=(n_assign_op: AAssignOp) do _n_assign_op = n_assign_op
-       var _n_value: AExpr = null
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
+       var n_id: TId is writable, noinit
+       var n_assign_op: AAssignOp is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 class ARangeExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ACrangeExpr
        super AExpr
-       var _n_obra: TObra = null
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       var _n_cbra: TCbra = null
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_obra: TObra is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
+       var n_cbra: TCbra is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AOrangeExpr
        super AExpr
-       var _n_obra: TObra = null
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr = null
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       var _n_cbra: TObra = null
-       fun n_cbra: TObra do return _n_cbra
-       fun n_cbra=(n_cbra: TObra) do _n_cbra = n_cbra
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_obra: TObra is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
+       var n_cbra: TObra is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AArrayExpr
        super AExpr
-       var _n_exprs: AExprs = null
-       fun n_exprs: AExprs do return _n_exprs
-       fun n_exprs=(n_exprs: AExprs) do _n_exprs = n_exprs
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_exprs: AExprs is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ASelfExpr
        super AExpr
-       var _n_kwself: TKwself = null
-       fun n_kwself: TKwself do return _n_kwself
-       fun n_kwself=(n_kwself: TKwself) do _n_kwself = n_kwself
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwself: TKwself is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AImplicitSelfExpr
        super AExpr
 end
 class ATrueExpr
        super AExpr
-       var _n_kwtrue: TKwtrue = null
-       fun n_kwtrue: TKwtrue do return _n_kwtrue
-       fun n_kwtrue=(n_kwtrue: TKwtrue) do _n_kwtrue = n_kwtrue
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwtrue: TKwtrue is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AFalseExpr
        super AExpr
-       var _n_kwfalse: TKwfalse = null
-       fun n_kwfalse: TKwfalse do return _n_kwfalse
-       fun n_kwfalse=(n_kwfalse: TKwfalse) do _n_kwfalse = n_kwfalse
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwfalse: TKwfalse is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ANullExpr
        super AExpr
-       var _n_kwnull: TKwnull = null
-       fun n_kwnull: TKwnull do return _n_kwnull
-       fun n_kwnull=(n_kwnull: TKwnull) do _n_kwnull = n_kwnull
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_kwnull: TKwnull is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ADecIntExpr
        super AExpr
-       var _n_number: TNumber = null
-       fun n_number: TNumber do return _n_number
-       fun n_number=(n_number: TNumber) do _n_number = n_number
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_number: TNumber is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AHexIntExpr
        super AExpr
-       var _n_hex_number: THexNumber = null
-       fun n_hex_number: THexNumber do return _n_hex_number
-       fun n_hex_number=(n_hex_number: THexNumber) do _n_hex_number = n_hex_number
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_hex_number: THexNumber is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AFloatExpr
        super AExpr
-       var _n_float: TFloat = null
-       fun n_float: TFloat do return _n_float
-       fun n_float=(n_float: TFloat) do _n_float = n_float
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_float: TFloat is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ACharExpr
        super AExpr
-       var _n_char: TChar = null
-       fun n_char: TChar do return _n_char
-       fun n_char=(n_char: TChar) do _n_char = n_char
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_char: TChar is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AStringExpr
        super AExpr
-       var _n_string: TString = null
-       fun n_string: TString do return _n_string
-       fun n_string=(n_string: TString) do _n_string = n_string
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_string: TString is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AStartStringExpr
        super AExpr
-       var _n_string: TStartString = null
-       fun n_string: TStartString do return _n_string
-       fun n_string=(n_string: TStartString) do _n_string = n_string
+       var n_string: TStartString is writable, noinit
 end
 class AMidStringExpr
        super AExpr
-       var _n_string: TMidString = null
-       fun n_string: TMidString do return _n_string
-       fun n_string=(n_string: TMidString) do _n_string = n_string
+       var n_string: TMidString is writable, noinit
 end
 class AEndStringExpr
        super AExpr
-       var _n_string: TEndString = null
-       fun n_string: TEndString do return _n_string
-       fun n_string=(n_string: TEndString) do _n_string = n_string
+       var n_string: TEndString is writable, noinit
 end
 class ASuperstringExpr
        super AExpr
        var n_exprs: List[AExpr] = new List[AExpr]
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AParExpr
        super AExpr
-       var _n_opar: TOpar = null
-       fun n_opar: TOpar do return _n_opar
-       fun n_opar=(n_opar: TOpar) do _n_opar = n_opar
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_cpar: TCpar = null
-       fun n_cpar: TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: TCpar) do _n_cpar = n_cpar
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_opar: TOpar is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_cpar: TCpar is writable, noinit
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class AAsCastExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwas: TKwas = null
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
+       var n_expr: AExpr is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_opar: nullable TOpar = null is writable
+       var n_type: AType is writable, noinit
+       var n_cpar: nullable TCpar = null is writable
 end
 class AAsNotnullExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwas: TKwas = null
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
-       var _n_kwnot: TKwnot = null
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_kwnull: TKwnull = null
-       fun n_kwnull: TKwnull do return _n_kwnull
-       fun n_kwnull=(n_kwnull: TKwnull) do _n_kwnull = n_kwnull
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
+       var n_expr: AExpr is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_opar: nullable TOpar = null is writable
+       var n_kwnot: TKwnot is writable, noinit
+       var n_kwnull: TKwnull is writable, noinit
+       var n_cpar: nullable TCpar = null is writable
 end
 class AIssetAttrExpr
        super AExpr
-       var _n_kwisset: TKwisset = null
-       fun n_kwisset: TKwisset do return _n_kwisset
-       fun n_kwisset=(n_kwisset: TKwisset) do _n_kwisset = n_kwisset
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_id: TAttrid = null
-       fun n_id: TAttrid do return _n_id
-       fun n_id=(n_id: TAttrid) do _n_id = n_id
+       var n_kwisset: TKwisset is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_id: TAttrid is writable, noinit
 end
 class ADebugTypeExpr
        super AExpr
-       var _n_kwdebug: TKwdebug = null
-       fun n_kwdebug: TKwdebug do return _n_kwdebug
-       fun n_kwdebug=(n_kwdebug: TKwdebug) do _n_kwdebug = n_kwdebug
-       var _n_kwtype: TKwtype = null
-       fun n_kwtype: TKwtype do return _n_kwtype
-       fun n_kwtype=(n_kwtype: TKwtype) do _n_kwtype = n_kwtype
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
+       var n_kwdebug: TKwdebug is writable, noinit
+       var n_kwtype: TKwtype is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_type: AType is writable, noinit
 end
 class AVarargExpr
        super AExpr
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_dotdotdot: TDotdotdot = null
-       fun n_dotdotdot: TDotdotdot do return _n_dotdotdot
-       fun n_dotdotdot=(n_dotdotdot: TDotdotdot) do _n_dotdotdot = n_dotdotdot
+       var n_expr: AExpr is writable, noinit
+       var n_dotdotdot: TDotdotdot is writable, noinit
 end
 class AListExprs
        super AExprs
@@ -1824,51 +1104,33 @@ class AListExprs
 end
 class AParExprs
        super AExprs
-       var _n_opar: TOpar = null
-       fun n_opar: TOpar do return _n_opar
-       fun n_opar=(n_opar: TOpar) do _n_opar = n_opar
+       var n_opar: TOpar is writable, noinit
        var n_exprs: List[AExpr] = new List[AExpr]
-       var _n_cpar: TCpar = null
-       fun n_cpar: TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: TCpar) do _n_cpar = n_cpar
+       var n_cpar: TCpar is writable, noinit
 end
 class ABraExprs
        super AExprs
-       var _n_obra: TObra = null
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
+       var n_obra: TObra is writable, noinit
        var n_exprs: List[AExpr] = new List[AExpr]
-       var _n_cbra: TCbra = null
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
+       var n_cbra: TCbra is writable, noinit
 end
 class APlusAssignOp
        super AAssignOp
-       var _n_pluseq: TPluseq = null
-       fun n_pluseq: TPluseq do return _n_pluseq
-       fun n_pluseq=(n_pluseq: TPluseq) do _n_pluseq = n_pluseq
+       var n_pluseq: TPluseq is writable, noinit
 end
 class AMinusAssignOp
        super AAssignOp
-       var _n_minuseq: TMinuseq = null
-       fun n_minuseq: TMinuseq do return _n_minuseq
-       fun n_minuseq=(n_minuseq: TMinuseq) do _n_minuseq = n_minuseq
+       var n_minuseq: TMinuseq is writable, noinit
 end
 class AModuleName
        super AModuleName
-       var _n_quad: nullable TQuad = null
-       fun n_quad: nullable TQuad do return _n_quad
-       fun n_quad=(n_quad: nullable TQuad) do _n_quad = n_quad
+       var n_quad: nullable TQuad = null is writable
        var n_path: List[TId] = new List[TId]
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
+       var n_id: TId is writable, noinit
 end
 class AExternCalls
        super AExternCalls
-       var _n_kwimport: TKwimport = null
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
+       var n_kwimport: TKwimport is writable, noinit
        var n_extern_calls: List[AExternCall] = new List[AExternCall]
 end
 class AExternCall
@@ -1876,100 +1138,56 @@ class AExternCall
 end
 class ASuperExternCall
        super AExternCall
-       var _n_kwsuper: TKwsuper = null
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
+       var n_kwsuper: TKwsuper is writable, noinit
 end
 class ALocalPropExternCall
        super AExternCall
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
+       var n_methid: AMethid is writable, noinit
 end
 class AFullPropExternCall
        super AExternCall
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_dot: nullable TDot = null
-       fun n_dot: nullable TDot do return _n_dot
-       fun n_dot=(n_dot: nullable TDot) do _n_dot = n_dot
-       var _n_methid: AMethid = null
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
+       var n_type: AType is writable, noinit
+       var n_dot: nullable TDot = null is writable
+       var n_methid: AMethid is writable, noinit
 end
 class AInitPropExternCall
        super AExternCall
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
+       var n_type: AType is writable, noinit
 end
 class ACastAsExternCall
        super AExternCall
-       var _n_from_type: AType = null
-       fun n_from_type: AType do return _n_from_type
-       fun n_from_type=(n_from_type: AType) do _n_from_type = n_from_type
-       var _n_dot: nullable TDot = null
-       fun n_dot: nullable TDot do return _n_dot
-       fun n_dot=(n_dot: nullable TDot) do _n_dot = n_dot
-       var _n_kwas: TKwas = null
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_to_type: AType = null
-       fun n_to_type: AType do return _n_to_type
-       fun n_to_type=(n_to_type: AType) do _n_to_type = n_to_type
+       var n_from_type: AType is writable, noinit
+       var n_dot: nullable TDot = null is writable
+       var n_kwas: TKwas is writable, noinit
+       var n_to_type: AType is writable, noinit
 end
 class AAsNullableExternCall
        super AExternCall
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_kwas: TKwas = null
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_kwnullable: TKwnullable = null
-       fun n_kwnullable: TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: TKwnullable) do _n_kwnullable = n_kwnullable
+       var n_type: AType is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_kwnullable: TKwnullable is writable, noinit
 end
 class AAsNotNullableExternCall
        super AExternCall
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_kwas: TKwas = null
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_kwnot: TKwnot = null
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_kwnullable: TKwnullable = null
-       fun n_kwnullable: TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: TKwnullable) do _n_kwnullable = n_kwnullable
+       var n_type: AType is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_kwnot: TKwnot is writable, noinit
+       var n_kwnullable: TKwnullable is writable, noinit
 end
 class AInLanguage
        super AInLanguage
-       var _n_kwin: TKwin = null
-       fun n_kwin: TKwin do return _n_kwin
-       fun n_kwin=(n_kwin: TKwin) do _n_kwin = n_kwin
-       var _n_string: TString = null
-       fun n_string: TString do return _n_string
-       fun n_string=(n_string: TString) do _n_string = n_string
+       var n_kwin: TKwin is writable, noinit
+       var n_string: TString is writable, noinit
 end
 class AExternCodeBlock
        super AExternCodeBlock
-       var _n_in_language: nullable AInLanguage = null
-       fun n_in_language: nullable AInLanguage do return _n_in_language
-       fun n_in_language=(n_in_language: nullable AInLanguage) do _n_in_language = n_in_language
-       var _n_extern_code_segment: TExternCodeSegment = null
-       fun n_extern_code_segment: TExternCodeSegment do return _n_extern_code_segment
-       fun n_extern_code_segment=(n_extern_code_segment: TExternCodeSegment) do _n_extern_code_segment = n_extern_code_segment
+       var n_in_language: nullable AInLanguage = null is writable
+       var n_extern_code_segment: TExternCodeSegment is writable, noinit
 end
 class AQualified
        super AQualified
        var n_id: List[TId] = new List[TId]
-       var _n_classid: nullable TClassid = null
-       fun n_classid: nullable TClassid do return _n_classid
-       fun n_classid=(n_classid: nullable TClassid) do _n_classid = n_classid
+       var n_classid: nullable TClassid = null is writable
 end
 class ADoc
        super ADoc
@@ -1977,105 +1195,63 @@ class ADoc
 end
 class AAnnotations
        super AAnnotations
-       var _n_at: nullable TAt = null
-       fun n_at: nullable TAt do return _n_at
-       fun n_at=(n_at: nullable TAt) do _n_at = n_at
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_at: nullable TAt = null is writable
+       var n_opar: nullable TOpar = null is writable
        var n_items: List[AAnnotation] = new List[AAnnotation]
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
+       var n_cpar: nullable TCpar = null is writable
 end
 class AAnnotation
        super AAnnotation
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: nullable AVisibility = null
-       fun n_visibility: nullable AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: nullable AVisibility) do _n_visibility = n_visibility
-       var _n_atid: AAtid = null
-       fun n_atid: AAtid do return _n_atid
-       fun n_atid=(n_atid: AAtid) do _n_atid = n_atid
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: nullable AVisibility = null is writable
+       var n_atid: AAtid is writable, noinit
+       var n_opar: nullable TOpar = null is writable
        var n_args: List[AAtArg] = new List[AAtArg]
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_cpar: nullable TCpar = null is writable
+       var n_annotations: nullable AAnnotations = null is writable
 end
 class ATypeAtArg
        super AAtArg
-       var _n_type: AType = null
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
+       var n_type: AType is writable, noinit
 end
 class AExprAtArg
        super AAtArg
-       var _n_expr: AExpr = null
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_expr: AExpr is writable, noinit
 end
 class AAtAtArg
        super AAtArg
-       var _n_annotations: AAnnotations = null
-       fun n_annotations: AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: AAnnotations) do _n_annotations = n_annotations
+       var n_annotations: AAnnotations is writable, noinit
 end
 class AIdAtid
        super AAtid
-       var _n_id: TId = null
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
+       var n_id: TId is writable, noinit
 end
 class AKwexternAtid
        super AAtid
-       var _n_id: TKwextern = null
-       fun n_id: TKwextern do return _n_id
-       fun n_id=(n_id: TKwextern) do _n_id = n_id
+       var n_id: TKwextern is writable, noinit
 end
 class AKwinternAtid
        super AAtid
-       var _n_id: TKwintern = null
-       fun n_id: TKwintern do return _n_id
-       fun n_id=(n_id: TKwintern) do _n_id = n_id
+       var n_id: TKwintern is writable, noinit
 end
 class AKwreadableAtid
        super AAtid
-       var _n_id: TKwreadable = null
-       fun n_id: TKwreadable do return _n_id
-       fun n_id=(n_id: TKwreadable) do _n_id = n_id
+       var n_id: TKwreadable is writable, noinit
 end
 class AKwwritableAtid
        super AAtid
-       var _n_id: TKwwritable = null
-       fun n_id: TKwwritable do return _n_id
-       fun n_id=(n_id: TKwwritable) do _n_id = n_id
+       var n_id: TKwwritable is writable, noinit
 end
 class AKwimportAtid
        super AAtid
-       var _n_id: TKwimport = null
-       fun n_id: TKwimport do return _n_id
-       fun n_id=(n_id: TKwimport) do _n_id = n_id
+       var n_id: TKwimport is writable, noinit
 end
 
 class Start
        super Prod
-       var _n_base: nullable AModule
-       fun n_base: nullable AModule do return _n_base
-       fun n_base=(n_base: nullable  do _n_base = n_base
-       var _n_eof: EOF
-       fun n_eof: EOF do return _n_eof
-       fun n_eof=(n_eof: EOF) do _n_eof = n_eof
+       var n_base: nullable AModule is writable, noinit
+       var n_eof: EOF is writable, noinit
        init(
                n_base: nullable AModule,
                n_eof: EOF)

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 5190abd..3cc5296 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -14,17 +14,15 @@
 
 # AST nodes of the Nit language
 # Was previously based on parser_abs.nit.
-module parser_nodes is old_style_init
+module parser_nodes
 
 import location
 
 # Root of the AST class-hierarchy
 abstract class ANode
-       var _location: nullable Location = null
-
        # Location is set during AST building. Once built, location cannon be null.
        # However, manual instantiated nodes may need more care.
-       fun location: Location do return _location.as(not null)
+       var location: Location is writable, noinit
 
        # The location of the important part of the node (identifier or whatever)
        fun hot_location: Location do return location
@@ -90,9 +88,6 @@ abstract class ANode
                end
        end
 
-       # Protect from invalid instantiation of nodes
-       private init do end
-
        # Replace a child with an other node in the AST
        private fun replace_child(old_child: ANode, new_child: nullable ANode) is abstract
 
@@ -269,18 +264,14 @@ end
 abstract class Prod
        super ANode
 
-       fun location=(l: Location) do _location = l
-
        # All the annotations attached directly to the node
-       var _n_annotations: nullable AAnnotations = null
-       fun n_annotations: nullable AAnnotations do return _n_annotations
-       fun n_annotations=(n_annotations: nullable AAnnotations) do _n_annotations = n_annotations
+       var n_annotations: nullable AAnnotations = null is writable
 
        redef fun replace_with(n: ANode)
        do
                super
                assert n isa Prod
-               if n._location == null then n._location = _location
+               if not isset n._location and isset _location then n._location = _location
        end
 end
 
@@ -304,9 +295,7 @@ abstract class Visitor
        end
 
        # The current visited node
-       var _current_node: nullable ANode = null
-       fun current_node: nullable ANode do return _current_node
-       fun current_node=(current_node: nullable ANode) do _current_node = current_node
+       var current_node: nullable ANode = null is writable
 end
 
 # Token of end of line (basically `\n`)
@@ -691,34 +680,20 @@ end
 class AModule
        super Prod
 
-       var _n_moduledecl: nullable AModuledecl = null
-       fun n_moduledecl: nullable AModuledecl do return _n_moduledecl
-       fun n_moduledecl=(n_moduledecl: nullable AModuledecl) do _n_moduledecl = n_moduledecl
+       var n_moduledecl: nullable AModuledecl = null is writable
        var n_imports: ANodes[AImport] = new ANodes[AImport](self)
        var n_extern_code_blocks: ANodes[AExternCodeBlock] = new ANodes[AExternCodeBlock](self)
        var n_classdefs: ANodes[AClassdef] = new ANodes[AClassdef](self)
-       init do end
 end
 
 # The declaration of the module with the documentation, name, and annotations
 class AModuledecl
        super Prod
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwmodule: TKwmodule
-       fun n_kwmodule: TKwmodule do return _n_kwmodule
-       fun n_kwmodule=(n_kwmodule: TKwmodule) do _n_kwmodule = n_kwmodule
-       var _n_name: AModuleName
-       fun n_name: AModuleName do return _n_name
-       fun n_name=(n_name: AModuleName) do _n_name = n_name
-       init do end
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwmodule: TKwmodule is writable, noinit
+       var n_name: AModuleName is writable, noinit
 end
 
 # A import clause of a module
@@ -729,31 +704,17 @@ end
 # A standard import clause. eg `import x`
 class AStdImport
        super AImport
-       var _n_visibility: AVisibility
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwimport: TKwimport
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
-       var _n_name: AModuleName
-       fun n_name: AModuleName do return _n_name
-       fun n_name=(n_name: AModuleName) do _n_name = n_name
-       init do end
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwimport: TKwimport is writable, noinit
+       var n_name: AModuleName is writable, noinit
 end
 
 # The special import clause of the kernel module. eg `import end`
 class ANoImport
        super AImport
-       var _n_visibility: AVisibility
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_kwimport: TKwimport
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
-       var _n_kwend: TKwend
-       fun n_kwend: TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: TKwend) do _n_kwend = n_kwend
-       init do end
+       var n_visibility: AVisibility is writable, noinit
+       var n_kwimport: TKwimport is writable, noinit
+       var n_kwend: TKwend is writable, noinit
 end
 
 # A visibility modifier
@@ -767,31 +728,19 @@ abstract class AVisibility
 end
 class APublicVisibility
        super AVisibility
-       var _n_kwpublic: nullable TKwpublic
-       fun n_kwpublic: nullable TKwpublic do return _n_kwpublic
-       fun n_kwpublic=(n_kwpublic: nullable TKwpublic) do _n_kwpublic = n_kwpublic
-       init do end
+       var n_kwpublic: nullable TKwpublic is writable
 end
 class APrivateVisibility
        super AVisibility
-       var _n_kwprivate: TKwprivate
-       fun n_kwprivate: TKwprivate do return _n_kwprivate
-       fun n_kwprivate=(n_kwprivate: TKwprivate) do _n_kwprivate = n_kwprivate
-       init do end
+       var n_kwprivate: TKwprivate is writable, noinit
 end
 class AProtectedVisibility
        super AVisibility
-       var _n_kwprotected: TKwprotected
-       fun n_kwprotected: TKwprotected do return _n_kwprotected
-       fun n_kwprotected=(n_kwprotected: TKwprotected) do _n_kwprotected = n_kwprotected
-       init do end
+       var n_kwprotected: TKwprotected is writable, noinit
 end
 class AIntrudeVisibility
        super AVisibility
-       var _n_kwintrude: TKwintrude
-       fun n_kwintrude: TKwintrude do return _n_kwintrude
-       fun n_kwintrude=(n_kwintrude: TKwintrude) do _n_kwintrude = n_kwintrude
-       init do end
+       var n_kwintrude: TKwintrude is writable, noinit
 end
 
 # A class definition
@@ -800,37 +749,21 @@ end
 abstract class AClassdef
        super Prod
        var n_propdefs: ANodes[APropdef] = new ANodes[APropdef](self)
-       init do end
 end
 
 # A standard class definition with a name, superclasses and properties
 class AStdClassdef
        super AClassdef
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: AVisibility
-       fun n_visibility: AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: AVisibility) do _n_visibility = n_visibility
-       var _n_classkind: AClasskind
-       fun n_classkind: AClasskind do return _n_classkind
-       fun n_classkind=(n_classkind: AClasskind) do _n_classkind = n_classkind
-       var _n_id: nullable TClassid = null
-       fun n_id: nullable TClassid do return _n_id
-       fun n_id=(n_id: nullable TClassid) do _n_id = n_id
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: AVisibility is writable, noinit
+       var n_classkind: AClasskind is writable, noinit
+       var n_id: nullable TClassid = null is writable
        var n_formaldefs: ANodes[AFormaldef] = new ANodes[AFormaldef](self)
-       var _n_extern_code_block: nullable AExternCodeBlock = null
-       fun n_extern_code_block: nullable AExternCodeBlock do return _n_extern_code_block
-       fun n_extern_code_block=(n_extern_code_block: nullable AExternCodeBlock) do _n_extern_code_block = n_extern_code_block
+       var n_extern_code_block: nullable AExternCodeBlock = null is writable
        var n_superclasses: ANodes[ASuperclass] = new ANodes[ASuperclass](self)
-       var _n_kwend: TKwend
-       fun n_kwend: TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: TKwend) do _n_kwend = n_kwend
+       var n_kwend: TKwend is writable, noinit
        redef fun hot_location do return n_id.location
-       init do end
 end
 
 # The implicit class definition of the implicit main method
@@ -849,154 +782,86 @@ abstract class AClasskind
 end
 class AConcreteClasskind
        super AClasskind
-       var _n_kwclass: TKwclass
-       fun n_kwclass: TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: TKwclass) do _n_kwclass = n_kwclass
-       init do end
+       var n_kwclass: TKwclass is writable, noinit
 end
 class AAbstractClasskind
        super AClasskind
-       var _n_kwabstract: TKwabstract
-       fun n_kwabstract: TKwabstract do return _n_kwabstract
-       fun n_kwabstract=(n_kwabstract: TKwabstract) do _n_kwabstract = n_kwabstract
-       var _n_kwclass: TKwclass
-       fun n_kwclass: TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: TKwclass) do _n_kwclass = n_kwclass
-       init do end
+       var n_kwabstract: TKwabstract is writable, noinit
+       var n_kwclass: TKwclass is writable, noinit
 end
 class AInterfaceClasskind
        super AClasskind
-       var _n_kwinterface: TKwinterface
-       fun n_kwinterface: TKwinterface do return _n_kwinterface
-       fun n_kwinterface=(n_kwinterface: TKwinterface) do _n_kwinterface = n_kwinterface
-       init do end
+       var n_kwinterface: TKwinterface is writable, noinit
 end
 class AEnumClasskind
        super AClasskind
-       var _n_kwenum: TKwenum
-       fun n_kwenum: TKwenum do return _n_kwenum
-       fun n_kwenum=(n_kwenum: TKwenum) do _n_kwenum = n_kwenum
-       init do end
+       var n_kwenum: TKwenum is writable, noinit
 end
 class AExternClasskind
        super AClasskind
-       var _n_kwextern: TKwextern
-       fun n_kwextern: TKwextern do return _n_kwextern
-       fun n_kwextern=(n_kwextern: TKwextern) do _n_kwextern = n_kwextern
-       var _n_kwclass: nullable TKwclass = null
-       fun n_kwclass: nullable TKwclass do return _n_kwclass
-       fun n_kwclass=(n_kwclass: nullable TKwclass) do _n_kwclass = n_kwclass
-       init do end
+       var n_kwextern: TKwextern is writable, noinit
+       var n_kwclass: nullable TKwclass = null is writable
 end
 
 # The definition of a formal generic parameter type. eg `X: Y`
 class AFormaldef
        super Prod
-       var _n_id: TClassid
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
+       var n_id: TClassid is writable, noinit
        # The bound of the parameter type
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       init do end
+       var n_type: nullable AType = null is writable
 end
 
 # A super-class. eg `super X`
 class ASuperclass
        super Prod
-       var _n_kwsuper: TKwsuper
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_kwsuper: TKwsuper is writable, noinit
+       var n_type: AType is writable, noinit
 end
 
 # The definition of a property
 abstract class APropdef
        super Prod
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: nullable AVisibility = null
-       fun n_visibility: nullable AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: nullable AVisibility) do _n_visibility = n_visibility
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: nullable AVisibility = null is writable
 end
 
 # A definition of an attribute
 # For historical reason, old-syle and new-style attributes use the same `ANode` sub-class
 class AAttrPropdef
        super APropdef
-       var _n_kwvar: TKwvar
-       fun n_kwvar: TKwvar do return _n_kwvar
-       fun n_kwvar=(n_kwvar: TKwvar) do _n_kwvar = n_kwvar
+       var n_kwvar: TKwvar is writable, noinit
 
        # The identifier for an old-style attribute (null if new-style)
-       var _n_id: nullable TAttrid
-       fun n_id: nullable TAttrid do return _n_id
-       fun n_id=(n_id: nullable TAttrid) do _n_id = n_id
+       var n_id: nullable TAttrid is writable
 
        # The identifier for a new-style attribute (null if old-style)
-       var _n_id2: nullable TId
-       fun n_id2: nullable TId do return _n_id2
-       fun n_id2=(n_id2: nullable TId) do _n_id2 = n_id2
-
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_readable: nullable AAble = null
-       fun n_readable: nullable AAble do return _n_readable
-       fun n_readable=(n_readable: nullable AAble) do _n_readable = n_readable
-       var _n_writable: nullable AAble = null
-       fun n_writable: nullable AAble do return _n_writable
-       fun n_writable=(n_writable: nullable AAble) do _n_writable = n_writable
+       var n_id2: nullable TId is writable
+
+       var n_type: nullable AType = null is writable
+       var n_readable: nullable AAble = null is writable
+       var n_writable: nullable AAble = null is writable
 
        # The initial value, if any
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
+       var n_expr: nullable AExpr = null is writable
        redef fun hot_location
        do
                if n_id != null then return n_id.location else return n_id2.location
        end
-       init do end
 end
 
 # A definition of all kind of method (including constructors)
 abstract class AMethPropdef
        super APropdef
-       var _n_kwmeth: nullable TKwmeth = null
-       fun n_kwmeth: nullable TKwmeth do return _n_kwmeth
-       fun n_kwmeth=(n_kwmeth: nullable TKwmeth) do _n_kwmeth = n_kwmeth
-       var _n_kwinit: nullable TKwinit = null
-       fun n_kwinit: nullable TKwinit do return _n_kwinit
-       fun n_kwinit=(n_kwinit: nullable TKwinit) do _n_kwinit = n_kwinit
-       var _n_kwnew: nullable TKwnew = null
-       fun n_kwnew: nullable TKwnew do return _n_kwnew
-       fun n_kwnew=(n_kwnew: nullable TKwnew) do _n_kwnew = n_kwnew
-       var _n_methid: nullable AMethid = null
-       fun n_methid: nullable AMethid do return _n_methid
-       fun n_methid=(n_methid: nullable AMethid) do _n_methid = n_methid
-       var _n_signature: nullable ASignature = null
-       fun n_signature: nullable ASignature do return _n_signature
-       fun n_signature=(n_signature: nullable ASignature) do _n_signature = n_signature
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       var _n_extern: nullable TString = null
-       fun n_extern: nullable TString do return _n_extern
-       fun n_extern=(n_extern: nullable TString) do _n_extern = n_extern
-       var _n_extern_calls: nullable AExternCalls = null
-       fun n_extern_calls: nullable AExternCalls do return _n_extern_calls
-       fun n_extern_calls=(n_extern_calls: nullable AExternCalls) do _n_extern_calls = n_extern_calls
-       var _n_extern_code_block: nullable AExternCodeBlock = null
-       fun n_extern_code_block: nullable AExternCodeBlock do return _n_extern_code_block
-       fun n_extern_code_block=(n_extern_code_block: nullable AExternCodeBlock) do _n_extern_code_block = n_extern_code_block
+       var n_kwmeth: nullable TKwmeth = null is writable
+       var n_kwinit: nullable TKwinit = null is writable
+       var n_kwnew: nullable TKwnew = null is writable
+       var n_methid: nullable AMethid = null is writable
+       var n_signature: nullable ASignature = null is writable
+       var n_block: nullable AExpr = null is writable
+       var n_extern: nullable TString = null is writable
+       var n_extern_calls: nullable AExternCalls = null is writable
+       var n_extern_code_block: nullable AExternCodeBlock = null is writable
        redef fun hot_location
        do
                if n_methid != null then
@@ -1067,11 +932,8 @@ end
 # Declaration of callbacks for extern methods
 class AExternCalls
        super Prod
-       var _n_kwimport: TKwimport
-       fun n_kwimport: TKwimport do return _n_kwimport
-       fun n_kwimport=(n_kwimport: TKwimport) do _n_kwimport = n_kwimport
+       var n_kwimport: TKwimport is writable, noinit
        var n_extern_calls: ANodes[AExternCall] = new ANodes[AExternCall](self)
-       init do end
 end
 abstract class AExternCall
        super Prod
@@ -1081,130 +943,71 @@ abstract class APropExternCall
 end
 class ALocalPropExternCall
        super APropExternCall
-       var _n_methid: AMethid
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       init do end
+       var n_methid: AMethid is writable, noinit
 end
 class AFullPropExternCall
        super APropExternCall
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_dot: nullable TDot = null
-       fun n_dot: nullable TDot do return _n_dot
-       fun n_dot=(n_dot: nullable TDot) do _n_dot = n_dot
-       var _n_methid: AMethid
-       fun n_methid: AMethid do return _n_methid
-       fun n_methid=(n_methid: AMethid) do _n_methid = n_methid
-       init do end
+       var n_type: AType is writable, noinit
+       var n_dot: nullable TDot = null is writable
+       var n_methid: AMethid is writable, noinit
 end
 class AInitPropExternCall
        super APropExternCall
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_type: AType is writable, noinit
 end
 class ASuperExternCall
        super AExternCall
-       var _n_kwsuper: TKwsuper
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
-       init do end
+       var n_kwsuper: TKwsuper is writable, noinit
 end
 abstract class ACastExternCall
        super AExternCall
 end
 class ACastAsExternCall
        super ACastExternCall
-       var _n_from_type: AType
-       fun n_from_type: AType do return _n_from_type
-       fun n_from_type=(n_from_type: AType) do _n_from_type = n_from_type
-       var _n_dot: nullable TDot = null
-       fun n_dot: nullable TDot do return _n_dot
-       fun n_dot=(n_dot: nullable TDot) do _n_dot = n_dot
-       var _n_kwas: TKwas
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_to_type: AType
-       fun n_to_type: AType do return _n_to_type
-       fun n_to_type=(n_to_type: AType) do _n_to_type = n_to_type
-       init do end
+       var n_from_type: AType is writable, noinit
+       var n_dot: nullable TDot = null is writable
+       var n_kwas: TKwas is writable, noinit
+       var n_to_type: AType is writable, noinit
 end
 class AAsNullableExternCall
        super ACastExternCall
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_kwas: TKwas
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_kwnullable: TKwnullable
-       fun n_kwnullable: TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: TKwnullable) do _n_kwnullable = n_kwnullable
-       init do end
+       var n_type: AType is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_kwnullable: TKwnullable is writable, noinit
 end
 class AAsNotNullableExternCall
        super ACastExternCall
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_kwas: TKwas
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_kwnot: TKwnot
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_kwnullable: TKwnullable
-       fun n_kwnullable: TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: TKwnullable) do _n_kwnullable = n_kwnullable
-       init do end
+       var n_type: AType is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_kwnot: TKwnot is writable, noinit
+       var n_kwnullable: TKwnullable is writable, noinit
 end
 
 # A definition of a virtual type
 class ATypePropdef
        super APropdef
-       var _n_kwtype: TKwtype
-       fun n_kwtype: TKwtype do return _n_kwtype
-       fun n_kwtype=(n_kwtype: TKwtype) do _n_kwtype = n_kwtype
-       var _n_id: TClassid
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_kwtype: TKwtype is writable, noinit
+       var n_id: TClassid is writable, noinit
+       var n_type: AType is writable, noinit
 end
 
 # A `writable` or `readable` modifier
 abstract class AAble
        super Prod
-       var _n_visibility: nullable AVisibility = null
-       fun n_visibility: nullable AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: nullable AVisibility) do _n_visibility = n_visibility
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       init do end
+       var n_visibility: nullable AVisibility = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
 end
 
 # A `readable` modifier
 class AReadAble
        super AAble
-       var _n_kwreadable: TKwreadable
-       fun n_kwreadable: TKwreadable do return _n_kwreadable
-       fun n_kwreadable=(n_kwreadable: TKwreadable) do _n_kwreadable = n_kwreadable
-       init do end
+       var n_kwreadable: TKwreadable is writable, noinit
 end
 
 # A `writable` modifier
 class AWriteAble
        super AAble
-       var _n_kwwritable: TKwwritable
-       fun n_kwwritable: TKwwritable do return _n_kwwritable
-       fun n_kwwritable=(n_kwwritable: TKwwritable) do _n_kwwritable = n_kwwritable
-       init do end
+       var n_kwwritable: TKwwritable is writable, noinit
 end
 
 # The identifier of a method in a method declaration.
@@ -1214,201 +1017,115 @@ abstract class AMethid
 end
 class AIdMethid
        super AMethid
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       init do end
+       var n_id: TId is writable, noinit
 end
 class APlusMethid
        super AMethid
-       var _n_plus: TPlus
-       fun n_plus: TPlus do return _n_plus
-       fun n_plus=(n_plus: TPlus) do _n_plus = n_plus
-       init do end
+       var n_plus: TPlus is writable, noinit
 end
 class AMinusMethid
        super AMethid
-       var _n_minus: TMinus
-       fun n_minus: TMinus do return _n_minus
-       fun n_minus=(n_minus: TMinus) do _n_minus = n_minus
-       init do end
+       var n_minus: TMinus is writable, noinit
 end
 class AStarMethid
        super AMethid
-       var _n_star: TStar
-       fun n_star: TStar do return _n_star
-       fun n_star=(n_star: TStar) do _n_star = n_star
-       init do end
+       var n_star: TStar is writable, noinit
 end
 class ASlashMethid
        super AMethid
-       var _n_slash: TSlash
-       fun n_slash: TSlash do return _n_slash
-       fun n_slash=(n_slash: TSlash) do _n_slash = n_slash
-       init do end
+       var n_slash: TSlash is writable, noinit
 end
 class APercentMethid
        super AMethid
-       var _n_percent: TPercent
-       fun n_percent: TPercent do return _n_percent
-       fun n_percent=(n_percent: TPercent) do _n_percent = n_percent
-       init do end
+       var n_percent: TPercent is writable, noinit
 end
 class AEqMethid
        super AMethid
-       var _n_eq: TEq
-       fun n_eq: TEq do return _n_eq
-       fun n_eq=(n_eq: TEq) do _n_eq = n_eq
-       init do end
+       var n_eq: TEq is writable, noinit
 end
 class ANeMethid
        super AMethid
-       var _n_ne: TNe
-       fun n_ne: TNe do return _n_ne
-       fun n_ne=(n_ne: TNe) do _n_ne = n_ne
-       init do end
+       var n_ne: TNe is writable, noinit
 end
 class ALeMethid
        super AMethid
-       var _n_le: TLe
-       fun n_le: TLe do return _n_le
-       fun n_le=(n_le: TLe) do _n_le = n_le
-       init do end
+       var n_le: TLe is writable, noinit
 end
 class AGeMethid
        super AMethid
-       var _n_ge: TGe
-       fun n_ge: TGe do return _n_ge
-       fun n_ge=(n_ge: TGe) do _n_ge = n_ge
-       init do end
+       var n_ge: TGe is writable, noinit
 end
 class ALtMethid
        super AMethid
-       var _n_lt: TLt
-       fun n_lt: TLt do return _n_lt
-       fun n_lt=(n_lt: TLt) do _n_lt = n_lt
-       init do end
+       var n_lt: TLt is writable, noinit
 end
 class AGtMethid
        super AMethid
-       var _n_gt: TGt
-       fun n_gt: TGt do return _n_gt
-       fun n_gt=(n_gt: TGt) do _n_gt = n_gt
-       init do end
+       var n_gt: TGt is writable, noinit
 end
 class ALlMethid
        super AMethid
-       var _n_ll: TLl
-       fun n_ll: TLl do return _n_ll
-       fun n_ll=(n_ll: TLl) do _n_ll = n_ll
-       init do end
+       var n_ll: TLl is writable, noinit
 end
 class AGgMethid
        super AMethid
-       var _n_gg: TGg
-       fun n_gg: TGg do return _n_gg
-       fun n_gg=(n_gg: TGg) do _n_gg = n_gg
-       init do end
+       var n_gg: TGg is writable, noinit
 end
 class ABraMethid
        super AMethid
-       var _n_obra: TObra
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       init do end
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
 end
 class AStarshipMethid
        super AMethid
-       var _n_starship: TStarship
-       fun n_starship: TStarship do return _n_starship
-       fun n_starship=(n_starship: TStarship) do _n_starship = n_starship
-       init do end
+       var n_starship: TStarship is writable, noinit
 end
 class AAssignMethid
        super AMethid
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_assign: TAssign
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       init do end
+       var n_id: TId is writable, noinit
+       var n_assign: TAssign is writable, noinit
 end
 class ABraassignMethid
        super AMethid
-       var _n_obra: TObra
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       var _n_assign: TAssign
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       init do end
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
+       var n_assign: TAssign is writable, noinit
 end
 
 # A signature in a method definition. eg `(x,y:X,z:Z):T`
 class ASignature
        super Prod
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_opar: nullable TOpar = null is writable
        var n_params: ANodes[AParam] = new ANodes[AParam](self)
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       init do end
+       var n_cpar: nullable TCpar = null is writable
+       var n_type: nullable AType = null is writable
 end
 
 # A parameter definition in a signature. eg `x:X`
 class AParam
        super Prod
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_dotdotdot: nullable TDotdotdot = null
-       fun n_dotdotdot: nullable TDotdotdot do return _n_dotdotdot
-       fun n_dotdotdot=(n_dotdotdot: nullable TDotdotdot) do _n_dotdotdot = n_dotdotdot
-       init do end
+       var n_id: TId is writable, noinit
+       var n_type: nullable AType = null is writable
+       var n_dotdotdot: nullable TDotdotdot = null is writable
 end
 
 # A static type. eg `nullable X[Y]`
 class AType
        super Prod
-       var _n_kwnullable: nullable TKwnullable = null
-       fun n_kwnullable: nullable TKwnullable do return _n_kwnullable
-       fun n_kwnullable=(n_kwnullable: nullable TKwnullable) do _n_kwnullable = n_kwnullable
+       var n_kwnullable: nullable TKwnullable = null is writable
 
        # The name of the class or of the formal type
-       var _n_id: TClassid
-       fun n_id: TClassid do return _n_id
-       fun n_id=(n_id: TClassid) do _n_id = n_id
+       var n_id: TClassid is writable, noinit
 
        # Type arguments for a generic type
        var n_types: ANodes[AType] = new ANodes[AType](self)
-       init do end
 end
 
 # A label at the end of a block or in a break/continue statement. eg `label x`
 class ALabel
        super Prod
-       var _n_kwlabel: TKwlabel
-       fun n_kwlabel: TKwlabel do return _n_kwlabel
-       fun n_kwlabel=(n_kwlabel: TKwlabel) do _n_kwlabel = n_kwlabel
-       var _n_id: nullable TId
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
-       init do end
+       var n_kwlabel: TKwlabel is writable, noinit
+       var n_id: nullable TId is writable
 end
 
 # Expression and statements
@@ -1422,247 +1139,140 @@ end
 class ABlockExpr
        super AExpr
        var n_expr: ANodes[AExpr] = new ANodes[AExpr](self)
-       var _n_kwend: nullable TKwend = null
-       fun n_kwend: nullable TKwend do return _n_kwend
-       fun n_kwend=(n_kwend: nullable TKwend) do _n_kwend = n_kwend
-       init do end
+       var n_kwend: nullable TKwend = null is writable
 end
 
 # A declaration of a local variable. eg `var x: X = y`
 class AVardeclExpr
        super AExpr
-       var _n_kwvar: TKwvar
-       fun n_kwvar: TKwvar do return _n_kwvar
-       fun n_kwvar=(n_kwvar: TKwvar) do _n_kwvar = n_kwvar
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       var _n_type: nullable AType = null
-       fun n_type: nullable AType do return _n_type
-       fun n_type=(n_type: nullable AType) do _n_type = n_type
-       var _n_assign: nullable TAssign = null
-       fun n_assign: nullable TAssign do return _n_assign
-       fun n_assign=(n_assign: nullable TAssign) do _n_assign = n_assign
+       var n_kwvar: TKwvar is writable, noinit
+       var n_id: TId is writable, noinit
+       var n_type: nullable AType = null is writable
+       var n_assign: nullable TAssign = null is writable
 
        # The initial value, if any
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
-       init do end
+       var n_expr: nullable AExpr = null is writable
 end
 
 # A `return` statement. eg `return x`
 class AReturnExpr
        super AExpr
-       var _n_kwreturn: nullable TKwreturn = null
-       fun n_kwreturn: nullable TKwreturn do return _n_kwreturn
-       fun n_kwreturn=(n_kwreturn: nullable TKwreturn) do _n_kwreturn = n_kwreturn
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
-       init do end
+       var n_kwreturn: nullable TKwreturn = null is writable
+       var n_expr: nullable AExpr = null is writable
 end
 
 # Something that has a label.
 abstract class ALabelable
        super Prod
-       var _n_label: nullable ALabel = null
-       fun n_label: nullable ALabel do return _n_label
-       fun n_label=(n_label: nullable ALabel) do _n_label = n_label
-       init do end
+       var n_label: nullable ALabel = null is writable
 end
 
 # A `break` statement.
 class ABreakExpr
        super AExpr
        super ALabelable
-       var _n_kwbreak: TKwbreak
-       fun n_kwbreak: TKwbreak do return _n_kwbreak
-       fun n_kwbreak=(n_kwbreak: TKwbreak) do _n_kwbreak = n_kwbreak
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
-       init do end
+       var n_kwbreak: TKwbreak is writable, noinit
+       var n_expr: nullable AExpr = null is writable
 end
 
 # An `abort` statement
 class AAbortExpr
        super AExpr
-       var _n_kwabort: TKwabort
-       fun n_kwabort: TKwabort do return _n_kwabort
-       fun n_kwabort=(n_kwabort: TKwabort) do _n_kwabort = n_kwabort
-       init do end
+       var n_kwabort: TKwabort is writable, noinit
 end
 
 # A `continue` statement
 class AContinueExpr
        super AExpr
        super ALabelable
-       var _n_kwcontinue: nullable TKwcontinue = null
-       fun n_kwcontinue: nullable TKwcontinue do return _n_kwcontinue
-       fun n_kwcontinue=(n_kwcontinue: nullable TKwcontinue) do _n_kwcontinue = n_kwcontinue
-       var _n_expr: nullable AExpr = null
-       fun n_expr: nullable AExpr do return _n_expr
-       fun n_expr=(n_expr: nullable AExpr) do _n_expr = n_expr
-       init do end
+       var n_kwcontinue: nullable TKwcontinue = null is writable
+       var n_expr: nullable AExpr = null is writable
 end
 
 # A `do` statement
 class ADoExpr
        super AExpr
        super ALabelable
-       var _n_kwdo: TKwdo
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       init do end
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
 end
 
 # A `if` statement
 class AIfExpr
        super AExpr
-       var _n_kwif: TKwif
-       fun n_kwif: TKwif do return _n_kwif
-       fun n_kwif=(n_kwif: TKwif) do _n_kwif = n_kwif
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_then: nullable AExpr = null
-       fun n_then: nullable AExpr do return _n_then
-       fun n_then=(n_then: nullable AExpr) do _n_then = n_then
-       var _n_else: nullable AExpr = null
-       fun n_else: nullable AExpr do return _n_else
-       fun n_else=(n_else: nullable AExpr) do _n_else = n_else
-       init do end
+       var n_kwif: TKwif is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_then: nullable AExpr = null is writable
+       var n_else: nullable AExpr = null is writable
 end
 
 # A `if` expression
 class AIfexprExpr
        super AExpr
-       var _n_kwif: TKwif
-       fun n_kwif: TKwif do return _n_kwif
-       fun n_kwif=(n_kwif: TKwif) do _n_kwif = n_kwif
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwthen: TKwthen
-       fun n_kwthen: TKwthen do return _n_kwthen
-       fun n_kwthen=(n_kwthen: TKwthen) do _n_kwthen = n_kwthen
-       var _n_then: AExpr
-       fun n_then: AExpr do return _n_then
-       fun n_then=(n_then: AExpr) do _n_then = n_then
-       var _n_kwelse: TKwelse
-       fun n_kwelse: TKwelse do return _n_kwelse
-       fun n_kwelse=(n_kwelse: TKwelse) do _n_kwelse = n_kwelse
-       var _n_else: AExpr
-       fun n_else: AExpr do return _n_else
-       fun n_else=(n_else: AExpr) do _n_else = n_else
-       init do end
+       var n_kwif: TKwif is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_kwthen: TKwthen is writable, noinit
+       var n_then: AExpr is writable, noinit
+       var n_kwelse: TKwelse is writable, noinit
+       var n_else: AExpr is writable, noinit
 end
 
 # A `while` statement
 class AWhileExpr
        super AExpr
        super ALabelable
-       var _n_kwwhile:  TKwwhile
-       fun n_kwwhile:  TKwwhile do return _n_kwwhile
-       fun n_kwwhile=(n_kwwhile:  TKwwhile) do _n_kwwhile = n_kwwhile
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwdo: TKwdo
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       init do end
+       var n_kwwhile:  TKwwhile is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
 end
 
 # A `loop` statement
 class ALoopExpr
        super AExpr
        super ALabelable
-       var _n_kwloop: TKwloop
-       fun n_kwloop: TKwloop do return _n_kwloop
-       fun n_kwloop=(n_kwloop: TKwloop) do _n_kwloop = n_kwloop
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       init do end
+       var n_kwloop: TKwloop is writable, noinit
+       var n_block: nullable AExpr = null is writable
 end
 
 # A `for` statement
 class AForExpr
        super AExpr
        super ALabelable
-       var _n_kwfor: TKwfor
-       fun n_kwfor: TKwfor do return _n_kwfor
-       fun n_kwfor=(n_kwfor: TKwfor) do _n_kwfor = n_kwfor
+       var n_kwfor: TKwfor is writable, noinit
        var n_ids: ANodes[TId] = new ANodes[TId](self)
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwdo: TKwdo
-       fun n_kwdo: TKwdo do return _n_kwdo
-       fun n_kwdo=(n_kwdo: TKwdo) do _n_kwdo = n_kwdo
-       var _n_block: nullable AExpr = null
-       fun n_block: nullable AExpr do return _n_block
-       fun n_block=(n_block: nullable AExpr) do _n_block = n_block
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_kwdo: TKwdo is writable, noinit
+       var n_block: nullable AExpr = null is writable
 end
 
 # An `assert` statement
 class AAssertExpr
        super AExpr
-       var _n_kwassert: TKwassert
-       fun n_kwassert: TKwassert do return _n_kwassert
-       fun n_kwassert=(n_kwassert: TKwassert) do _n_kwassert = n_kwassert
-       var _n_id: nullable TId = null
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_else: nullable AExpr = null
-       fun n_else: nullable AExpr do return _n_else
-       fun n_else=(n_else: nullable AExpr) do _n_else = n_else
-       init do end
+       var n_kwassert: TKwassert is writable, noinit
+       var n_id: nullable TId = null is writable
+       var n_expr: AExpr is writable, noinit
+       var n_else: nullable AExpr = null is writable
 end
 
 # Whatever is a simple assignment. eg `= something`
 abstract class AAssignFormExpr
        super AExpr
-       var _n_assign: TAssign
-       fun n_assign: TAssign do return _n_assign
-       fun n_assign=(n_assign: TAssign) do _n_assign = n_assign
-       var _n_value: AExpr
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
-       init do end
+       var n_assign: TAssign is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 
 # Whatever is a combined assignment. eg `+= something`
 abstract class AReassignFormExpr
        super AExpr
-       var _n_assign_op: AAssignOp
-       fun n_assign_op: AAssignOp do return _n_assign_op
-       fun n_assign_op=(n_assign_op: AAssignOp) do _n_assign_op = n_assign_op
-       var _n_value: AExpr
-       fun n_value: AExpr do return _n_value
-       fun n_value=(n_value: AExpr) do _n_value = n_value
-       init do end
+       var n_assign_op: AAssignOp is writable, noinit
+       var n_value: AExpr is writable, noinit
 end
 
 # A `once` expression. eg `once x`
 class AOnceExpr
        super AProxyExpr
-       var _n_kwonce: TKwonce
-       fun n_kwonce: TKwonce do return _n_kwonce
-       fun n_kwonce=(n_kwonce: TKwonce) do _n_kwonce = n_kwonce
-       init do end
+       var n_kwonce: TKwonce is writable, noinit
 end
 
 # A polymorphic invocation of a method
@@ -1670,10 +1280,7 @@ end
 abstract class ASendExpr
        super AExpr
        # The receiver of the method invocation
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       init do end
+       var n_expr: AExpr is writable, noinit
 end
 
 # A binary operation on a method
@@ -1681,10 +1288,7 @@ abstract class ABinopExpr
        super ASendExpr
        # The second operand of the operation
        # Note: the receiver (`n_expr`) is the first operand
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr2: AExpr is writable, noinit
 end
 
 # Something that is boolean expression
@@ -1695,61 +1299,36 @@ end
 # A `or` expression 
 class AOrExpr
        super ABoolExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 
 # A `and` expression
 class AAndExpr
        super ABoolExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 
 # A `or else` expression
 class AOrElseExpr
        super ABoolExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 
 # A `implies` expression
 class AImpliesExpr
        super ABoolExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 
 # A `not` expression
 class ANotExpr
        super ABoolExpr
-       var _n_kwnot: TKwnot
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       init do end
+       var n_kwnot: TKwnot is writable, noinit
+       var n_expr: AExpr is writable, noinit
 end
 
 # A `==` expression
@@ -1795,13 +1374,8 @@ end
 # A type-ckeck expression. eg `x isa T`
 class AIsaExpr
        super ABoolExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_type: AType is writable, noinit
 end
 
 # A `+` expression
@@ -1837,30 +1411,18 @@ end
 # A unary minus expression. eg `-x`
 class AUminusExpr
        super ASendExpr
-       var _n_minus: TMinus
-       fun n_minus: TMinus do return _n_minus
-       fun n_minus=(n_minus: TMinus) do _n_minus = n_minus
-       init do end
+       var n_minus: TMinus is writable, noinit
 end
 
 # An explicit instantiation. eg `new T`
 class ANewExpr
        super AExpr
-       var _n_kwnew: TKwnew
-       fun n_kwnew: TKwnew do return _n_kwnew
-       fun n_kwnew=(n_kwnew: TKwnew) do _n_kwnew = n_kwnew
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
+       var n_kwnew: TKwnew is writable, noinit
+       var n_type: AType is writable, noinit
 
        # The name of the named-constructor, if any
-       var _n_id: nullable TId = null
-       fun n_id: nullable TId do return _n_id
-       fun n_id=(n_id: nullable TId) do _n_id = n_id
-       var _n_args: AExprs
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       init do end
+       var n_id: nullable TId = null is writable
+       var n_args: AExprs is writable, noinit
 end
 
 # Whatever is a old-style attribute access
@@ -1868,16 +1430,11 @@ abstract class AAttrFormExpr
        super AExpr
 
        # The receiver of the attribute
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
+       var n_expr: AExpr is writable, noinit
 
        # The name of the attribute
-       var _n_id: TAttrid
-       fun n_id: TAttrid do return _n_id
-       fun n_id=(n_id: TAttrid) do _n_id = n_id
+       var n_id: TAttrid is writable, noinit
 
-       init do end
 end
 
 # The read of an attribute. eg `x._a`
@@ -1896,15 +1453,10 @@ abstract class ACallFormExpr
        super ASendExpr
 
        # The name of the method
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
+       var n_id: TId is writable, noinit
 
        # The arguments of the call
-       var _n_args: AExprs
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       init do end
+       var n_args: AExprs is writable, noinit
 end
 
 # A complex setter call (standard or brackets)
@@ -1945,38 +1497,23 @@ end
 # A call to `super`. OR a call of a super-constructor
 class ASuperExpr
        super AExpr
-       var _n_qualified: nullable AQualified = null
-       fun n_qualified: nullable AQualified do return _n_qualified
-       fun n_qualified=(n_qualified: nullable AQualified) do _n_qualified = n_qualified
-       var _n_kwsuper: TKwsuper
-       fun n_kwsuper: TKwsuper do return _n_kwsuper
-       fun n_kwsuper=(n_kwsuper: TKwsuper) do _n_kwsuper = n_kwsuper
-       var _n_args: AExprs
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       init do end
+       var n_qualified: nullable AQualified = null is writable
+       var n_kwsuper: TKwsuper is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 
 # A call to the `init` constructor.
 # Note: because `init` is a keyword and not a `TId`, the explicit call to init cannot be a ACallFormExpr.
 class AInitExpr
        super ASendExpr
-       var _n_kwinit: TKwinit
-       fun n_kwinit: TKwinit do return _n_kwinit
-       fun n_kwinit=(n_kwinit: TKwinit) do _n_kwinit = n_kwinit
-       var _n_args: AExprs
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       init do end
+       var n_kwinit: TKwinit is writable, noinit
+       var n_args: AExprs is writable, noinit
 end
 
 # Whatever looks-like a call of the brackets `[]` operator.
 abstract class ABraFormExpr
        super ASendExpr
-       var _n_args: AExprs
-       fun n_args: AExprs do return _n_args
-       fun n_args=(n_args: AExprs) do _n_args = n_args
-       init do end
+       var n_args: AExprs is writable, noinit
 end
 
 # A call of the brackets operator. eg `x[y,z]`
@@ -1993,10 +1530,7 @@ end
 # Whatever is an access to a local variable
 abstract class AVarFormExpr
        super AExpr
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       init do end
+       var n_id: TId is writable, noinit
 end
 
 # A complex setter call of the bracket operator. eg `x[y,z]+=t`
@@ -2028,55 +1562,34 @@ end
 # A literal range, open or closed
 abstract class ARangeExpr
        super AExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_expr2: AExpr
-       fun n_expr2: AExpr do return _n_expr2
-       fun n_expr2=(n_expr2: AExpr) do _n_expr2 = n_expr2
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_expr2: AExpr is writable, noinit
 end
 
 # A closed literal range. eg `[x..y]`
 class ACrangeExpr
        super ARangeExpr
-       var _n_obra: TObra
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       init do end
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
 end
 
 # An open literal range. eg `[x..y[`
 class AOrangeExpr
        super ARangeExpr
-       var _n_obra: TObra
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TObra
-       fun n_cbra: TObra do return _n_cbra
-       fun n_cbra=(n_cbra: TObra) do _n_cbra = n_cbra
-       init do end
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TObra is writable, noinit
 end
 
 # A literal array. eg. `[x,y,z]`
 class AArrayExpr
        super AExpr
-       var _n_exprs: AExprs
-       fun n_exprs: AExprs do return _n_exprs
-       fun n_exprs=(n_exprs: AExprs) do _n_exprs = n_exprs
-       init do end
+       var n_exprs: AExprs is writable, noinit
 end
 
 # A read of `self` 
 class ASelfExpr
        super AExpr
-       var _n_kwself: nullable TKwself
-       fun n_kwself: nullable TKwself do return _n_kwself
-       fun n_kwself=(n_kwself: nullable TKwself) do _n_kwself = n_kwself
-       init do end
+       var n_kwself: nullable TKwself is writable
 end
 
 # When there is no explicit receiver, `self` is implicit
@@ -2087,26 +1600,17 @@ end
 # A `true` boolean literal constant
 class ATrueExpr
        super ABoolExpr
-       var _n_kwtrue: TKwtrue
-       fun n_kwtrue: TKwtrue do return _n_kwtrue
-       fun n_kwtrue=(n_kwtrue: TKwtrue) do _n_kwtrue = n_kwtrue
-       init do end
+       var n_kwtrue: TKwtrue is writable, noinit
 end
 # A `false` boolean literal constant
 class AFalseExpr
        super ABoolExpr
-       var _n_kwfalse: TKwfalse
-       fun n_kwfalse: TKwfalse do return _n_kwfalse
-       fun n_kwfalse=(n_kwfalse: TKwfalse) do _n_kwfalse = n_kwfalse
-       init do end
+       var n_kwfalse: TKwfalse is writable, noinit
 end
 # A `null` literal constant
 class ANullExpr
        super AExpr
-       var _n_kwnull: TKwnull
-       fun n_kwnull: TKwnull do return _n_kwnull
-       fun n_kwnull=(n_kwnull: TKwnull) do _n_kwnull = n_kwnull
-       init do end
+       var n_kwnull: TKwnull is writable, noinit
 end
 # An integer literal
 class AIntExpr
@@ -2115,42 +1619,27 @@ end
 # An integer literal in decimal format
 class ADecIntExpr
        super AIntExpr
-       var _n_number: TNumber
-       fun n_number: TNumber do return _n_number
-       fun n_number=(n_number: TNumber) do _n_number = n_number
-       init do end
+       var n_number: TNumber is writable, noinit
 end
 # An integer literal in hexadecimal format
 class AHexIntExpr
        super AIntExpr
-       var _n_hex_number: THexNumber
-       fun n_hex_number: THexNumber do return _n_hex_number
-       fun n_hex_number=(n_hex_number: THexNumber) do _n_hex_number = n_hex_number
-       init do end
+       var n_hex_number: THexNumber is writable, noinit
 end
 # A float literal
 class AFloatExpr
        super AExpr
-       var _n_float: TFloat
-       fun n_float: TFloat do return _n_float
-       fun n_float=(n_float: TFloat) do _n_float = n_float
-       init do end
+       var n_float: TFloat is writable, noinit
 end
 # A character literal
 class ACharExpr
        super AExpr
-       var _n_char: TChar
-       fun n_char: TChar do return _n_char
-       fun n_char=(n_char: TChar) do _n_char = n_char
-       init do end
+       var n_char: TChar is writable, noinit
 end
 # A string literal
 abstract class AStringFormExpr
        super AExpr
-       var _n_string: Token
-       fun n_string: Token do return _n_string
-       fun n_string=(n_string: Token) do _n_string = n_string
-       init do end
+       var n_string: Token is writable, noinit
 end
 
 # A simple string. eg. `"abc"`
@@ -2178,119 +1667,68 @@ end
 class ASuperstringExpr
        super AExpr
        var n_exprs: ANodes[AExpr] = new ANodes[AExpr](self)
-       init do end
 end
 
 # A simple parenthesis. eg `(x)`
 class AParExpr
        super AProxyExpr
-       var _n_opar: TOpar
-       fun n_opar: TOpar do return _n_opar
-       fun n_opar=(n_opar: TOpar) do _n_opar = n_opar
-       var _n_cpar: TCpar
-       fun n_cpar: TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_opar: TOpar is writable, noinit
+       var n_cpar: TCpar is writable, noinit
 end
 
 # Whatevej just contains (and mimic) an other expression
 abstract class AProxyExpr
        super AExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       init do end
+       var n_expr: AExpr is writable, noinit
 end
 
 # A type cast. eg `x.as(T)`
 class AAsCastExpr
        super AExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwas: TKwas
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_opar: nullable TOpar = null is writable
+       var n_type: AType is writable, noinit
+       var n_cpar: nullable TCpar = null is writable
 end
 
 # A as-not-null cast. eg `x.as(not null)`
 class AAsNotnullExpr
        super AExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_kwas: TKwas
-       fun n_kwas: TKwas do return _n_kwas
-       fun n_kwas=(n_kwas: TKwas) do _n_kwas = n_kwas
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
-       var _n_kwnot: TKwnot
-       fun n_kwnot: TKwnot do return _n_kwnot
-       fun n_kwnot=(n_kwnot: TKwnot) do _n_kwnot = n_kwnot
-       var _n_kwnull: TKwnull
-       fun n_kwnull: TKwnull do return _n_kwnull
-       fun n_kwnull=(n_kwnull: TKwnull) do _n_kwnull = n_kwnull
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_kwas: TKwas is writable, noinit
+       var n_opar: nullable TOpar = null is writable
+       var n_kwnot: TKwnot is writable, noinit
+       var n_kwnull: TKwnull is writable, noinit
+       var n_cpar: nullable TCpar = null is writable
 end
 
 # A is-set check of old-style attributes. eg `isset x._a`
 class AIssetAttrExpr
        super AAttrFormExpr
-       var _n_kwisset: TKwisset
-       fun n_kwisset: TKwisset do return _n_kwisset
-       fun n_kwisset=(n_kwisset: TKwisset) do _n_kwisset = n_kwisset
-       init do end
+       var n_kwisset: TKwisset is writable, noinit
 end
 
 # A elyspis notation used to pass an expression as it in a vararg parameter
 class AVarargExpr
        super AExpr
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_dotdotdot: TDotdotdot
-       fun n_dotdotdot: TDotdotdot do return _n_dotdotdot
-       fun n_dotdotdot=(n_dotdotdot: TDotdotdot) do _n_dotdotdot = n_dotdotdot
-       init do end
+       var n_expr: AExpr is writable, noinit
+       var n_dotdotdot: TDotdotdot is writable, noinit
 end
 
 # A list of expression separated with commas (arguments for instance)
 abstract class AExprs
        super Prod 
        var n_exprs: ANodes[AExpr] = new ANodes[AExpr](self)
-       init do end
 end
 
 
 class ADebugTypeExpr
        super AExpr
-       var _n_kwdebug: TKwdebug
-       fun n_kwdebug: TKwdebug do return _n_kwdebug
-       fun n_kwdebug=(n_kwdebug: TKwdebug) do _n_kwdebug = n_kwdebug
-       var _n_kwtype: TKwtype
-       fun n_kwtype: TKwtype do return _n_kwtype
-       fun n_kwtype=(n_kwtype: TKwtype) do _n_kwtype = n_kwtype
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_kwdebug: TKwdebug is writable, noinit
+       var n_kwtype: TKwtype is writable, noinit
+       var n_expr: AExpr is writable, noinit
+       var n_type: AType is writable, noinit
 end
 
 # A simple list of expressions
@@ -2301,25 +1739,15 @@ end
 # A list of expressions enclosed in parentheses
 class AParExprs
        super AExprs
-       var _n_opar: TOpar
-       fun n_opar: TOpar do return _n_opar
-       fun n_opar=(n_opar: TOpar) do _n_opar = n_opar
-       var _n_cpar: TCpar
-       fun n_cpar: TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_opar: TOpar is writable, noinit
+       var n_cpar: TCpar is writable, noinit
 end
 
 # A list of expressions enclosed in brackets
 class ABraExprs
        super AExprs
-       var _n_obra: TObra
-       fun n_obra: TObra do return _n_obra
-       fun n_obra=(n_obra: TObra) do _n_obra = n_obra
-       var _n_cbra: TCbra
-       fun n_cbra: TCbra do return _n_cbra
-       fun n_cbra=(n_cbra: TCbra) do _n_cbra = n_cbra
-       init do end
+       var n_obra: TObra is writable, noinit
+       var n_cbra: TCbra is writable, noinit
 end
 
 # A complex assignment operator. eg `+=`
@@ -2328,60 +1756,34 @@ abstract class AAssignOp
 end
 class APlusAssignOp
        super AAssignOp
-       var _n_pluseq: TPluseq
-       fun n_pluseq: TPluseq do return _n_pluseq
-       fun n_pluseq=(n_pluseq: TPluseq) do _n_pluseq = n_pluseq
-       init do end
+       var n_pluseq: TPluseq is writable, noinit
 end
 class AMinusAssignOp
        super AAssignOp
-       var _n_minuseq: TMinuseq
-       fun n_minuseq: TMinuseq do return _n_minuseq
-       fun n_minuseq=(n_minuseq: TMinuseq) do _n_minuseq = n_minuseq
-       init do end
+       var n_minuseq: TMinuseq is writable, noinit
 end
 
 class AModuleName
        super Prod
-       var _n_quad: nullable TQuad = null
-       fun n_quad: nullable TQuad do return _n_quad
-       fun n_quad=(n_quad: nullable TQuad) do _n_quad = n_quad
+       var n_quad: nullable TQuad = null is writable
        var n_path: ANodes[TId] = new ANodes[TId](self)
-       var _n_id: TId
-       fun n_id: TId do return _n_id
-       fun n_id=(n_id: TId) do _n_id = n_id
-       init do end
+       var n_id: TId is writable, noinit
 end
 class AInLanguage
        super Prod
-       var _n_kwin: TKwin
-       fun n_kwin: TKwin do return _n_kwin
-       fun n_kwin=(n_kwin: TKwin) do _n_kwin = n_kwin
-       var _n_string: TString
-       fun n_string: TString do return _n_string
-       fun n_string=(n_string: TString) do _n_string = n_string
-       init do end
+       var n_kwin: TKwin is writable, noinit
+       var n_string: TString is writable, noinit
 end
 class AExternCodeBlock
        super Prod
-       var _n_in_language: nullable AInLanguage = null
-       fun n_in_language: nullable AInLanguage do return _n_in_language
-       fun n_in_language=(n_in_language: nullable AInLanguage) do _n_in_language = n_in_language
-       var _n_extern_code_segment: TExternCodeSegment
-       fun n_extern_code_segment: TExternCodeSegment do return _n_extern_code_segment
-       fun n_extern_code_segment=(n_extern_code_segment: TExternCodeSegment) do _n_extern_code_segment = n_extern_code_segment
-       init do end
+       var n_in_language: nullable AInLanguage = null is writable
+       var n_extern_code_segment: TExternCodeSegment is writable, noinit
 end
 class AQualified
        super Prod
-       var _n_quad: nullable TQuad = null
-       fun n_quad: nullable TQuad do return _n_quad
-       fun n_quad=(n_quad: nullable TQuad) do _n_quad = n_quad
+       var n_quad: nullable TQuad = null is writable
        var n_id: ANodes[TId] = new ANodes[TId](self)
-       var _n_classid: nullable TClassid = null
-       fun n_classid: nullable TClassid do return _n_classid
-       fun n_classid=(n_classid: nullable TClassid) do _n_classid = n_classid
-       init do end
+       var n_classid: nullable TClassid = null is writable
 end
 
 # A documentation of a definition
@@ -2389,72 +1791,42 @@ end
 class ADoc
        super Prod
        var n_comment: ANodes[TComment] = new ANodes[TComment](self)
-       init do end
 end
 
 class AAnnotations
        super Prod
-       var _n_at: nullable TAt = null
-       fun n_at: nullable TAt do return _n_at
-       fun n_at=(n_at: nullable TAt) do _n_at = n_at
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_at: nullable TAt = null is writable
+       var n_opar: nullable TOpar = null is writable
        var n_items: ANodes[AAnnotation] = new ANodes[AAnnotation](self)
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_cpar: nullable TCpar = null is writable
 end
 class AAnnotation
        super Prod
-       var _n_doc: nullable ADoc = null
-       fun n_doc: nullable ADoc do return _n_doc
-       fun n_doc=(n_doc: nullable ADoc) do _n_doc = n_doc
-       var _n_kwredef: nullable TKwredef = null
-       fun n_kwredef: nullable TKwredef do return _n_kwredef
-       fun n_kwredef=(n_kwredef: nullable TKwredef) do _n_kwredef = n_kwredef
-       var _n_visibility: nullable AVisibility
-       fun n_visibility: nullable AVisibility do return _n_visibility
-       fun n_visibility=(n_visibility: nullable AVisibility) do _n_visibility = n_visibility
-       var _n_atid: AAtid
-       fun n_atid: AAtid do return _n_atid
-       fun n_atid=(n_atid: AAtid) do _n_atid = n_atid
-       var _n_opar: nullable TOpar = null
-       fun n_opar: nullable TOpar do return _n_opar
-       fun n_opar=(n_opar: nullable TOpar) do _n_opar = n_opar
+       var n_doc: nullable ADoc = null is writable
+       var n_kwredef: nullable TKwredef = null is writable
+       var n_visibility: nullable AVisibility is writable
+       var n_atid: AAtid is writable, noinit
+       var n_opar: nullable TOpar = null is writable
        var n_args: ANodes[AAtArg] = new ANodes[AAtArg](self)
-       var _n_cpar: nullable TCpar = null
-       fun n_cpar: nullable TCpar do return _n_cpar
-       fun n_cpar=(n_cpar: nullable TCpar) do _n_cpar = n_cpar
-       init do end
+       var n_cpar: nullable TCpar = null is writable
 end
 abstract class AAtArg
        super Prod
 end
 class ATypeAtArg
        super AAtArg
-       var _n_type: AType
-       fun n_type: AType do return _n_type
-       fun n_type=(n_type: AType) do _n_type = n_type
-       init do end
+       var n_type: AType is writable, noinit
 end
 class AExprAtArg
        super AAtArg
-       var _n_expr: AExpr
-       fun n_expr: AExpr do return _n_expr
-       fun n_expr=(n_expr: AExpr) do _n_expr = n_expr
-       init do end
+       var n_expr: AExpr is writable, noinit
 end
 class AAtAtArg
        super AAtArg
 end
 abstract class AAtid
        super Prod
-       var _n_id: Token
-       fun n_id: Token do return _n_id
-       fun n_id=(n_id: Token) do _n_id = n_id
-       init do end
+       var n_id: Token is writable, noinit
 end
 class AIdAtid
        super AAtid
@@ -2478,12 +1850,8 @@ end
 # The root of the AST
 class Start
        super Prod
-       var _n_base: nullable AModule
-       fun n_base: nullable AModule do return _n_base
-       fun n_base=(n_base: nullable AModule) do _n_base = n_base
-       var _n_eof: EOF
-       fun n_eof: EOF do return _n_eof
-       fun n_eof=(n_eof: EOF) do _n_eof = n_eof
+       var n_base: nullable AModule is writable
+       var n_eof: EOF is writable, noinit
        init(n_base: nullable AModule, n_eof: EOF)
        do
                self._n_base = n_base

diff --git a/src/parser/parser_work.nit b/src/parser/parser_work.nit
index 5b217da..fdd8604 100644 (file)
--- a/src/parser/parser_work.nit
+++ b/src/parser/parser_work.nit
@@ -20,10 +20,10 @@ intrude import parser_prod
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number
-       var _state: Int
+       var state: Int
 
        # The node stored with the state in the stack
-       var _nodes: nullable Object
+       var nodes: nullable Object
 
        init(state: Int, nodes: nullable Object)
        do
@@ -35,13 +35,13 @@ end
 class Parser
        super TablesCapable
        # Associated lexer
-       var _lexer: Lexer
+       var lexer: Lexer
 
        # Stack of pushed states and productions
-       var _stack: Array[State]
+       private var stack: Array[State]
 
        # Position in the stack
-       var _stack_pos: Int
+       private var stack_pos: Int
 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)
@@ -154,7 +154,7 @@ class Parser
                                return node
                        else if action_type == 3 then # ERROR
                                # skip injected tokens
-                               while token._location == null do token = lexer.next
+                               while not isset token._location do token = lexer.next
                                var node2 = new AParserError.init_parser_error("Syntax error: unexpected {token}.", token.location, token)
                                var node = new Start(null, node2)
                                return node
@@ -162,14 +162,14 @@ class Parser
                end
        end
 
-       var _reduce_table: Array[ReduceAction]
+       private var reduce_table: Array[ReduceAction]
        private fun build_reduce_table is abstract
 end
 
 redef class Prod
        # Location on the first token after the start of a production
        # So outside the production for epilon production
-       var _first_location: nullable Location
+       var first_location: nullable Location
 end
 
 # Find location of production nodes
@@ -177,19 +177,19 @@ end
 private class ComputeProdLocationVisitor
        super Visitor
        # Currenlty visited productions that need a first token
-       var _need_first_prods: Array[Prod] = new Array[Prod]
+       var need_first_prods: Array[Prod] = new Array[Prod]
 
        # Already visited epsilon productions that waits something after them
-       var _need_after_epsilons: Array[Prod] = new Array[Prod]
+       var need_after_epsilons: Array[Prod] = new Array[Prod]
 
        # Location of the last visited token in the current production
-       var _last_location: nullable Location = null
+       var last_location: nullable Location = null
 
        redef fun visit(n: ANode)
        do
                if n isa Token then
+                       if not isset n._location then return
                        var loc = n._location
-                       if loc == null then return
                        _last_location = loc
 
                        # Add a first token to productions that need one
@@ -249,6 +249,6 @@ private abstract class ReduceAction
                l1.append(l2)
                return l1
        end
-       var _goto: Int
+       var goto: Int
        init(g: Int) do _goto = g
 end

diff --git a/src/parser/xss/prods.xss b/src/parser/xss/prods.xss
index 1d04163..da6dae9 100644 (file)
--- a/src/parser/xss/prods.xss
+++ b/src/parser/xss/prods.xss
@@ -30,13 +30,9 @@ $   if @is_list
        var n_@name: List[@etype] = new List[@etype]
 $   else
 $   if @modifier
-       var _n_@name: nullable @etype = null
-       fun n_@name: nullable @etype do return _n_@name
-       fun n_@name=(n_@name: nullable @etype) do _n_@name = n_@name
+       var n_@name: nullable @etype = null is writable
 $   else
-       var _n_@name: @etype = null
-       fun n_@name: @etype do return _n_@name
-       fun n_@name=(n_@name: @etype) do _n_@name = n_@name
+       var n_@name: @etype is writable, noinit
 $   end
 $   end
 $ end
@@ -45,12 +41,8 @@ $ end
 
 class Start
        super Prod
-       var _n_base: nullable $baseprod
-       fun n_base: nullable $baseprod do return _n_base
-       fun n_base=(n_base: nullable $baseprod_ do _n_base = n_base
-       var _n_eof: EOF
-       fun n_eof: EOF do return _n_eof
-       fun n_eof=(n_eof: EOF) do _n_eof = n_eof
+       var n_base: nullable $baseprod is writable, noinit
+       var n_eof: EOF is writable, noinit
        init(
                n_base: nullable $baseprod,
                n_eof: EOF)

diff --git a/tests/sav/test_c_alt1.res b/tests/sav/test_c_alt1.res
index 258f855..aa38be4 100644 (file)
--- a/tests/sav/test_c_alt1.res
+++ b/tests/sav/test_c_alt1.res
@@ -1 +1 @@
-Runtime error: Assert failed (../lib/c.nit:62)
+Runtime error: Assert failed (../lib/c.nit:64)

diff --git a/tests/sav/test_c_alt2.res b/tests/sav/test_c_alt2.res
index 7cbd189..95d7a74 100644 (file)
--- a/tests/sav/test_c_alt2.res
+++ b/tests/sav/test_c_alt2.res
@@ -1,2 +1,2 @@
-Runtime error: Assert failed (../lib/c.nit:55)
+Runtime error: Assert failed (../lib/c.nit:57)
 0

diff --git a/tests/sav/test_c_alt3.res b/tests/sav/test_c_alt3.res
index 7cbd189..95d7a74 100644 (file)
--- a/tests/sav/test_c_alt3.res
+++ b/tests/sav/test_c_alt3.res
@@ -1,2 +1,2 @@
-Runtime error: Assert failed (../lib/c.nit:55)
+Runtime error: Assert failed (../lib/c.nit:57)
 0

diff --git a/tests/sav/test_c_alt4.res b/tests/sav/test_c_alt4.res
index 5cb6f67..3bb984c 100644 (file)
--- a/tests/sav/test_c_alt4.res
+++ b/tests/sav/test_c_alt4.res
@@ -1,4 +1,4 @@
-Runtime error: Assert failed (../lib/c.nit:54)
+Runtime error: Assert failed (../lib/c.nit:56)
 0
 0
 1

diff --git a/tests/sav/test_new_native_alt1.res b/tests/sav/test_new_native_alt1.res
index 83c6493..c08210d 100644 (file)
--- a/tests/sav/test_new_native_alt1.res
+++ b/tests/sav/test_new_native_alt1.res
@@ -1,4 +1,4 @@
-Runtime error: Cast failed. Expected `NativeArray#0`, got `Bool` (../lib/standard/collection/array.nit:755)
+Runtime error: Cast failed. Expected `NativeArray#0`, got `Bool` (../lib/standard/collection/array.nit:754)
 NativeString
 N
 Nit