syntax: 'meth' -> 'fun', 'attr' -> 'var'

Tests results are updated to reflect the column change in error messages.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/examples/fibonacci.nit b/examples/fibonacci.nit
index 0df0209..fcf7426 100644 (file)
--- a/examples/fibonacci.nit
+++ b/examples/fibonacci.nit
@@ -19,7 +19,7 @@ package fibonacci
 
 redef class Int
        # Calculate the self-th element of the fibonacci sequence.
 
 redef class Int
        # Calculate the self-th element of the fibonacci sequence.

-       meth fibonacci: Int
+       fun fibonacci: Int

        do
                if self < 2 then
                        return 1
        do
                if self < 2 then
                        return 1

@@ -30,7 +30,7 @@ redef class Int
 end
 
 # Print usage and exit.
 end
 
 # Print usage and exit.

-meth usage
+fun usage

 do
        print "Usage: fibonnaci <integer>" 
        exit 0 
 do
        print "Usage: fibonnaci <integer>" 
        exit 0 

diff --git a/examples/procedural_array.nit b/examples/procedural_array.nit
index 6d31fc2..8ceb3a8 100644 (file)
--- a/examples/procedural_array.nit
+++ b/examples/procedural_array.nit
@@ -20,7 +20,7 @@ package procedural_array
 
 # The sum of the elements of `a'.
 # Uses a 'for' control structure.
 
 # The sum of the elements of `a'.
 # Uses a 'for' control structure.

-meth array_sum(a: Array[Int]): Int
+fun array_sum(a: Array[Int]): Int

 do
        var sum = 0
        for i in a do
 do
        var sum = 0
        for i in a do

@@ -31,7 +31,7 @@ end
 
 # The sum of the elements of `a' (alternative version).
 # Uses a 'while' control structure.
 
 # The sum of the elements of `a' (alternative version).
 # Uses a 'while' control structure.

-meth array_sum_alt(a: Array[Int]): Int
+fun array_sum_alt(a: Array[Int]): Int

 do
        var sum = 0
        var i = 0
 do
        var sum = 0
        var i = 0

diff --git a/lib/dummy_array.nit b/lib/dummy_array.nit
index adecf04..46297ea 100644 (file)
--- a/lib/dummy_array.nit
+++ b/lib/dummy_array.nit
@@ -13,12 +13,12 @@
 class DummyArray
 special Set[Int]
 special ArrayCapable[Int]
 class DummyArray
 special Set[Int]
 special ArrayCapable[Int]

-       attr _capacity: Int 
-       redef readable attr _length: Int 
-       attr _keys: NativeArray[Int]
-       attr _values: NativeArray[Int]
+       var _capacity: Int 
+       redef readable var _length: Int 
+       var _keys: NativeArray[Int]
+       var _values: NativeArray[Int]

 
 

-       redef meth add(value: Int)
+       redef fun add(value: Int)

        do
                assert full: _length < (_capacity-1)
                var l = _length
        do
                assert full: _length < (_capacity-1)
                var l = _length

@@ -27,7 +27,7 @@ special ArrayCapable[Int]
                _length = l + 1
        end
 
                _length = l + 1
        end
 

-       redef meth remove(value: Int)
+       redef fun remove(value: Int)

        do
                assert not is_empty
                var l = _length
        do
                assert not is_empty
                var l = _length

@@ -40,7 +40,7 @@ special ArrayCapable[Int]
                _length = l - 1
        end
 
                _length = l - 1
        end
 

-       redef meth has(value: Int): Bool
+       redef fun has(value: Int): Bool

        do
                assert value < _capacity
                var pos = _keys[value]
        do
                assert value < _capacity
                var pos = _keys[value]

@@ -50,28 +50,28 @@ special ArrayCapable[Int]
                return false
        end
 
                return false
        end
 

-       redef meth first: Int
+       redef fun first: Int

        do
                assert _length > 0
                return _values[0]
        end
 
        do
                assert _length > 0
                return _values[0]
        end
 

-       redef meth is_empty: Bool
+       redef fun is_empty: Bool

        do
                return not (_length > 0)
        end
 
        do
                return not (_length > 0)
        end
 

-       redef meth clear
+       redef fun clear

        do
                _length = 0
        end
 
        do
                _length = 0
        end
 

-       redef meth iterator: DummyIterator
+       redef fun iterator: DummyIterator

        do
                return new DummyIterator(self)
        end
 
        do
                return new DummyIterator(self)
        end
 

-       private meth value_at(pos: Int): Int
+       private fun value_at(pos: Int): Int

        do
                return _values[pos]
        end
        do
                return _values[pos]
        end

@@ -86,21 +86,21 @@ end
 
 class DummyIterator
 special Iterator[Int]
 
 class DummyIterator
 special Iterator[Int]

-       attr _array: DummyArray
-       attr _pos: Int
+       var _array: DummyArray
+       var _pos: Int

 
 

-       redef meth item: Int
+       redef fun item: Int

        do
                assert is_ok
                return _array.value_at(_pos)
        end
 
        do
                assert is_ok
                return _array.value_at(_pos)
        end
 

-       redef meth is_ok: Bool
+       redef fun is_ok: Bool

        do
                return _pos < _array.length
        end
 
        do
                return _pos < _array.length
        end
 

-       redef meth next do _pos = _pos + 1 end
+       redef fun next do _pos = _pos + 1 end

 
        init(array: DummyArray)
        do
 
        init(array: DummyArray)
        do

diff --git a/lib/filter_stream.nit b/lib/filter_stream.nit
index 52076c9..bcd01be 100644 (file)
--- a/lib/filter_stream.nit
+++ b/lib/filter_stream.nit
@@ -13,15 +13,15 @@
 class FilterIStream
 special IStream
        # Filter readed elements
 class FilterIStream
 special IStream
        # Filter readed elements

-       readable attr _stream: IStream 
+       readable var _stream: IStream 

 
 

-       redef meth eof: Bool
+       redef fun eof: Bool

        do
                assert stream != null
                return stream.eof
        end
 
        do
                assert stream != null
                return stream.eof
        end
 

-       private meth stream=(i: IStream)
+       private fun stream=(i: IStream)

        do
                _stream = i
        end
        do
                _stream = i
        end

@@ -30,16 +30,16 @@ end
 class FilterOStream
 special OStream
        # Filter outputed elements
 class FilterOStream
 special OStream
        # Filter outputed elements

-       readable attr _stream: OStream 
+       readable var _stream: OStream 

 
        # Can the stream be used to write
 
        # Can the stream be used to write

-       redef meth is_writable: Bool
+       redef fun is_writable: Bool

        do
                assert stream != null
                return stream.is_writable
        end
 
        do
                assert stream != null
                return stream.is_writable
        end
 

-       private meth stream=(i: OStream)
+       private fun stream=(i: OStream)

        do
                _stream = i
        end
        do
                _stream = i
        end

@@ -47,9 +47,9 @@ end
 
 class StreamCat
 special FilterIStream
 
 class StreamCat
 special FilterIStream

-       attr _streams: Iterator[IStream]
+       var _streams: Iterator[IStream]

 
 

-       redef meth eof: Bool
+       redef fun eof: Bool

        do
                if stream == null then
                        return true
        do
                if stream == null then
                        return true

@@ -62,7 +62,7 @@ special FilterIStream
                end
        end
 
                end
        end
 

-       redef meth stream: IStream
+       redef fun stream: IStream

        do
                if _stream == null and _streams.is_ok then
                        stream = _streams.item
        do
                if _stream == null and _streams.is_ok then
                        stream = _streams.item

@@ -72,13 +72,13 @@ special FilterIStream
                return _stream
        end
 
                return _stream
        end
 

-       redef meth read_char: Int
+       redef fun read_char: Int

        do
                assert not eof
                return stream.read_char
        end
 
        do
                assert not eof
                return stream.read_char
        end
 

-       redef meth close
+       redef fun close

        do
                while stream != null do
                        stream.close
        do
                while stream != null do
                        stream.close

@@ -98,9 +98,9 @@ end
 
 class StreamDemux
 special FilterOStream
 
 class StreamDemux
 special FilterOStream

-       attr _streams: Array[OStream]
+       var _streams: Array[OStream]

 
 

-       redef meth is_writable: Bool
+       redef fun is_writable: Bool

        do
                if stream.is_writable then
                        return true
        do
                if stream.is_writable then
                        return true

@@ -115,7 +115,7 @@ special FilterOStream
                end
        end
 
                end
        end
 

-       redef meth write(s: String)
+       redef fun write(s: String)

        do
                for i in _streams
                do
        do
                for i in _streams
                do

diff --git a/lib/game.nit b/lib/game.nit
index 929ba42..dea6d9f 100644 (file)
--- a/lib/game.nit
+++ b/lib/game.nit
@@ -27,13 +27,13 @@ import sdl
 class TickCounter
        # Register a new tick
        # Return true every time interval
 class TickCounter
        # Register a new tick
        # Return true every time interval

-       meth update: Bool
+       fun update: Bool

        do
                return update_with(sdl_get_ticks)
        end
 
        # Like `update' but with an explicit time instead of `sdl_get_ticks`
        do
                return update_with(sdl_get_ticks)
        end
 
        # Like `update' but with an explicit time instead of `sdl_get_ticks`

-       meth update_with(time: Int): Bool
+       fun update_with(time: Int): Bool

        do
                var f = _ticks + 1
                var dt = time - _time
        do
                var f = _ticks + 1
                var dt = time - _time

@@ -54,21 +54,21 @@ class TickCounter
        end
 
        # The number of ticks in the last time interval
        end
 
        # The number of ticks in the last time interval

-       readable attr _count: Int 
+       readable var _count: Int 

        
        

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return _count.to_s
        end
 
        # A ticks counter
        do
                return _count.to_s
        end
 
        # A ticks counter

-       attr _ticks: Int
+       var _ticks: Int

 
        # Last update time
 
        # Last update time

-       attr _time: Int
+       var _time: Int

 
        # The time interval
 
        # The time interval

-       readable writable attr _time_interval: Int
+       readable writable var _time_interval: Int

 
        # Create a new counter (time interval is 1000)
        init
 
        # Create a new counter (time interval is 1000)
        init

@@ -84,14 +84,14 @@ class TickCounter
 end
 
 class Rectangle
 end
 
 class Rectangle

-       meth left: Int is abstract
-       meth right: Int is abstract
-       meth top: Int is abstract
-       meth bottom: Int is abstract
-       meth width: Int is abstract
-       meth height: Int is abstract
+       fun left: Int is abstract
+       fun right: Int is abstract
+       fun top: Int is abstract
+       fun bottom: Int is abstract
+       fun width: Int is abstract
+       fun height: Int is abstract

        
        

-       meth contain_pixel(x: Int, y: Int): Bool
+       fun contain_pixel(x: Int, y: Int): Bool

        # Is `self' contains the point (`x',`y') ?
        do
                return x >= left and
        # Is `self' contains the point (`x',`y') ?
        do
                return x >= left and

@@ -100,7 +100,7 @@ class Rectangle
                        y < bottom
        end
 
                        y < bottom
        end
 

-       meth collide(o: Rectangle): Bool
+       fun collide(o: Rectangle): Bool

        do
                var s_l = left
                var s_r = right
        do
                var s_l = left
                var s_r = right

@@ -127,29 +127,29 @@ class Sprite
 special Rectangle
 
        # Absolute X coordinate of the main pixel in the screen
 special Rectangle
 
        # Absolute X coordinate of the main pixel in the screen

-       readable writable attr _x: Int
+       readable writable var _x: Int

 
        # Absolute Y coordinate of the main pixel in the screen
 
        # Absolute Y coordinate of the main pixel in the screen

-       readable writable attr _y: Int
+       readable writable var _y: Int

 
        # Set two coordinates in one instruction
 
        # Set two coordinates in one instruction

-       meth set_xy(x: Int, y: Int)
+       fun set_xy(x: Int, y: Int)

        do
                self.x = x
                self.y = y
        end
 
        # The current image of the object
        do
                self.x = x
                self.y = y
        end
 
        # The current image of the object

-       readable attr _image: SDL_Surface
+       readable var _image: SDL_Surface

 
        # Relative X cordinate of the main pixel in the image
 
        # Relative X cordinate of the main pixel in the image

-       readable attr _x_image: Int
+       readable var _x_image: Int

 
        # Relative Y cordinate of the main pixel in the image
 
        # Relative Y cordinate of the main pixel in the image

-       readable attr _y_image: Int
+       readable var _y_image: Int

        
        # Set image and relative coordinates in one instruction
        
        # Set image and relative coordinates in one instruction

-       meth set_image(i: SDL_Surface, x: Int, y: Int)
+       fun set_image(i: SDL_Surface, x: Int, y: Int)

        do
                _image = i
                _x_image = x
        do
                _image = i
                _x_image = x

@@ -157,45 +157,45 @@ special Rectangle
        end
        
        # Set image centered on the main pixel (adjust x_image and y_image)
        end
        
        # Set image centered on the main pixel (adjust x_image and y_image)

-       meth set_centered_image(i: SDL_Surface)
+       fun set_centered_image(i: SDL_Surface)

        do
                _image = i
                _x_image = i.width / 2
                _y_image = i.height / 2
        end
 
        do
                _image = i
                _x_image = i.width / 2
                _y_image = i.height / 2
        end
 

-       redef meth left: Int
+       redef fun left: Int

        do
                return _x - _x_image
        end
        
        do
                return _x - _x_image
        end
        

-       redef meth top: Int
+       redef fun top: Int

        do
                return _y - _y_image
        end
 
        do
                return _y - _y_image
        end
 

-       redef meth right: Int
+       redef fun right: Int

        do
                return _x - _x_image + _image.width
        end
 
        do
                return _x - _x_image + _image.width
        end
 

-       redef meth bottom: Int
+       redef fun bottom: Int

        do
                return _y - _y_image + _image.height
        end
 
        do
                return _y - _y_image + _image.height
        end
 

-       redef meth width: Int
+       redef fun width: Int

        do
                return _image.width
        end
 
        do
                return _image.width
        end
 

-       redef meth height: Int
+       redef fun height: Int

        do
                return _image.height
        end
        
        # Draw the image on the surface
        do
                return _image.height
        end
        
        # Draw the image on the surface

-       meth blit_on(s: SDL_Surface)
+       fun blit_on(s: SDL_Surface)

        do
                _image.blit_on_xy(s, _x - _x_image, _y - _y_image)
        end
        do
                _image.blit_on_xy(s, _x - _x_image, _y - _y_image)
        end

diff --git a/lib/opts.nit b/lib/opts.nit
index 5f409e8..1673215 100644 (file)
--- a/lib/opts.nit
+++ b/lib/opts.nit
@@ -14,25 +14,25 @@
 # Super class of all option's class
 class Option
        # Names for the option (including long and short ones)
 # Super class of all option's class
 class Option
        # Names for the option (including long and short ones)

-       readable attr _names: Array[String]
+       readable var _names: Array[String]

 
        # Type of the value of the option
        type VALUE: nullable Object
 
        # Human readable description of the option
 
        # Type of the value of the option
        type VALUE: nullable Object
 
        # Human readable description of the option

-       readable attr _helptext: String 
+       readable var _helptext: String 

 
        # Is this option mandatory?
 
        # Is this option mandatory?

-       readable writable attr _mandatory: Bool 
+       readable writable var _mandatory: Bool 

 
        # Current value of this option
 
        # Current value of this option

-       writable attr _value: nullable VALUE
+       writable var _value: nullable VALUE

 
        # Current value of this option
 
        # Current value of this option

-       meth value: VALUE do return _value.as(VALUE)
+       fun value: VALUE do return _value.as(VALUE)

 
        # Default value of this option
 
        # Default value of this option

-       readable writable attr _default_value: nullable VALUE
+       readable writable var _default_value: nullable VALUE

 
        # Create a new option
        init init_opt(help: String, default: nullable VALUE, names: nullable Array[String])
 
        # Create a new option
        init init_opt(help: String, default: nullable VALUE, names: nullable Array[String])

@@ -49,13 +49,13 @@ class Option
        end
 
        # Add new aliases for this option
        end
 
        # Add new aliases for this option

-       meth add_aliases(names: String...) do _names.add_all(names)
+       fun add_aliases(names: String...) do _names.add_all(names)

        
        # An help text for this option with default settings
        
        # An help text for this option with default settings

-       redef meth to_s do return pretty(2)
+       redef fun to_s do return pretty(2)

        
        # A pretty print for this help
        
        # A pretty print for this help

-       meth pretty(off: Int): String
+       fun pretty(off: Int): String

        do
                var text = new Buffer.from("  ")
                text.append(_names.join(", "))
        do
                var text = new Buffer.from("  ")
                text.append(_names.join(", "))

@@ -67,7 +67,7 @@ class Option
                return text.to_s
        end
 
                return text.to_s
        end
 

-       meth pretty_default: String
+       fun pretty_default: String

        do
                if default_value != null then
                        return " ({default_value})"
        do
                if default_value != null then
                        return " ({default_value})"

@@ -76,16 +76,16 @@ class Option
        end
 
        # Consume parameters for this option
        end
 
        # Consume parameters for this option

-       protected meth read_param(it: Iterator[String]) is abstract
+       protected fun read_param(it: Iterator[String]) is abstract

 end
 
 class OptionText
 special Option
        init(text: String) do init_opt(text, null, null)
 
 end
 
 class OptionText
 special Option
        init(text: String) do init_opt(text, null, null)
 

-       redef meth pretty(off) do return to_s
+       redef fun pretty(off) do return to_s

 
 

-       redef meth to_s do return helptext
+       redef fun to_s do return helptext

 end
 
 class OptionBool
 end
 
 class OptionBool

@@ -94,7 +94,7 @@ special Option
 
        init(help: String, names: String...) do init_opt(help, false, names)
 
 
        init(help: String, names: String...) do init_opt(help, false, names)
 

-       redef meth read_param(it) do value = true
+       redef fun read_param(it) do value = true

 end
 
 class OptionCount
 end
 
 class OptionCount

@@ -103,15 +103,15 @@ special Option
 
        init(help: String, names: String...) do init_opt(help, 0, names)
 
 
        init(help: String, names: String...) do init_opt(help, 0, names)
 

-       redef meth read_param(it) do value += 1
+       redef fun read_param(it) do value += 1

 end
 
 # Option with one mandatory parameter
 class OptionParameter
 special Option
 end
 
 # Option with one mandatory parameter
 class OptionParameter
 special Option

-       protected meth convert(str: String): VALUE is abstract
+       protected fun convert(str: String): VALUE is abstract

 
 

-       redef meth read_param(it)
+       redef fun read_param(it)

        do
                if it.is_ok then
                        value = convert(it.item)
        do
                if it.is_ok then
                        value = convert(it.item)

@@ -130,13 +130,13 @@ special OptionParameter
 
        init(help: String, names: String...) do init_opt(help, null, names)
 
 
        init(help: String, names: String...) do init_opt(help, null, names)
 

-       redef meth convert(str) do return str
+       redef fun convert(str) do return str

 end
 
 class OptionEnum
 special OptionParameter
        redef type VALUE: Int
 end
 
 class OptionEnum
 special OptionParameter
        redef type VALUE: Int

-       attr _enum: Array[String]
+       var _enum: Array[String]

 
        init(enum: Array[String], help: String, default: Int, names: String...)
        do
 
        init(enum: Array[String], help: String, default: Int, names: String...)
        do

@@ -145,13 +145,13 @@ special OptionParameter
                init_opt("{help} <{enum.join(", ")}>", default, names)
        end
 
                init_opt("{help} <{enum.join(", ")}>", default, names)
        end
 

-       redef meth convert(str)
+       redef fun convert(str)

        do
                var id = _enum.index_of(str)
                return id
        end
 
        do
                var id = _enum.index_of(str)
                return id
        end
 

-       redef meth pretty_default
+       redef fun pretty_default

        do
                if default_value != null then
                        return " ({_enum[default_value.as(not null)]})"
        do
                if default_value != null then
                        return " ({_enum[default_value.as(not null)]})"

@@ -167,7 +167,7 @@ special OptionParameter
 
        init(help: String, default: Int, names: String...) do init_opt(help, default, names)
        
 
        init(help: String, default: Int, names: String...) do init_opt(help, default, names)
        

-       redef meth convert(str) do return str.to_i
+       redef fun convert(str) do return str.to_i

 end
 
 class OptionArray
 end
 
 class OptionArray

@@ -180,8 +180,8 @@ special OptionParameter
                init_opt(help, _values, names)
        end
 
                init_opt(help, _values, names)
        end
 

-       attr _values: Array[String]     
-       redef meth convert(str)
+       var _values: Array[String]      
+       redef fun convert(str)

        do
                _values.add(str)
                return _values
        do
                _values.add(str)
                return _values

@@ -189,12 +189,12 @@ special OptionParameter
 end
 
 class OptionContext
 end
 
 class OptionContext

-       readable attr _options: Array[Option] 
-       readable attr _rest: Array[String] 
+       readable var _options: Array[Option] 
+       readable var _rest: Array[String] 

 
 

-       attr _optmap: Map[String, Option]
+       var _optmap: Map[String, Option]

        
        

-       meth usage
+       fun usage

        do
                var lmax = 1
                for i in _options do
        do
                var lmax = 1
                for i in _options do

@@ -211,13 +211,13 @@ class OptionContext
        end
 
        # Parse ans assign options everywhere is the argument list
        end
 
        # Parse ans assign options everywhere is the argument list

-       meth parse(argv: Collection[String])
+       fun parse(argv: Collection[String])

        do
                var it = argv.iterator
                parse_intern(it)
        end
 
        do
                var it = argv.iterator
                parse_intern(it)
        end
 

-       protected meth parse_intern(it: Iterator[String])
+       protected fun parse_intern(it: Iterator[String])

        do
                var parseargs = true
                build
        do
                var parseargs = true
                build

@@ -242,7 +242,7 @@ class OptionContext
                end
        end
 
                end
        end
 

-       meth add_option(opts: Option...)
+       fun add_option(opts: Option...)

        do
                for opt in opts do
                        _options.add(opt)
        do
                for opt in opts do
                        _options.add(opt)

@@ -256,7 +256,7 @@ class OptionContext
                _rest = new Array[String]
        end
 
                _rest = new Array[String]
        end
 

-       private meth build
+       private fun build

        do
                for o in _options do
                        for n in o.names do
        do
                for o in _options do
                        for n in o.names do

diff --git a/lib/sdl.nit b/lib/sdl.nit
index f8f1f3e..e1e8b87 100644 (file)
--- a/lib/sdl.nit
+++ b/lib/sdl.nit
@@ -15,122 +15,122 @@ package sdl
 
 universal SDL_Surface
 special Pointer
 
 universal SDL_Surface
 special Pointer

-       meth width: Int is extern "sdl_surface_width"
-       meth height: Int is extern "sdl_surface_height"
+       fun width: Int is extern "sdl_surface_width"
+       fun height: Int is extern "sdl_surface_height"

        
        

-       meth lock_surface: Int is extern "SDL_LockSurface"
-       meth unlock_surface: Int is extern "SDL_LockSurface"
+       fun lock_surface: Int is extern "SDL_LockSurface"
+       fun unlock_surface: Int is extern "SDL_LockSurface"

 
 

-       meth blit_on(dest: SDL_Surface) is extern "sdl_blit_surface"
-       meth blit_on_xy(dest: SDL_Surface, dest_x: Int, dest_y: Int) is extern "sdl_blit_surface_xy"
+       fun blit_on(dest: SDL_Surface) is extern "sdl_blit_surface"
+       fun blit_on_xy(dest: SDL_Surface, dest_x: Int, dest_y: Int) is extern "sdl_blit_surface_xy"

 
 

-       meth update_rect(x: Int, y: Int, w: Int, h: Int) is extern "SDL_UpdateRect"
-       meth update_all
+       fun update_rect(x: Int, y: Int, w: Int, h: Int) is extern "SDL_UpdateRect"
+       fun update_all

        do
                update_rect(0, 0, 0, 0)
        end
 
        do
                update_rect(0, 0, 0, 0)
        end
 

-       meth clear is extern "sdl_clear_sruface"
+       fun clear is extern "sdl_clear_sruface"

 
 

-       meth to_display_format: SDL_Surface is extern "SDL_DisplayFormat"
-       meth free is extern "SDL_FreeSurface"
+       fun to_display_format: SDL_Surface is extern "SDL_DisplayFormat"
+       fun free is extern "SDL_FreeSurface"

 end
 
 universal SDL_Screen
 special SDL_Surface
 end
 
 universal SDL_Screen
 special SDL_Surface

-       meth flip is extern "SDL_Flip"
+       fun flip is extern "SDL_Flip"

 end
        
 universal SDL_Event
 special Pointer
 end
        
 universal SDL_Event
 special Pointer

-       meth is_keyboard: Bool is extern "sdl_evt_is_keyboard"
-       meth as_keyboard: SDL_KeyboardEvent is extern "sdl_evt_as_keyboard"
-       meth is_mouse_button: Bool is extern "sdl_evt_is_mouse_button"
-       meth as_mouse_button: SDL_MouseButtonEvent is extern "sdl_evt_as_mouse_button"
-       meth is_mouse_motion: Bool is extern "sdl_evt_is_mouse_motion"
-       meth as_mouse_motion: SDL_MouseMotionEvent is extern "sdl_evt_as_mouse_motion"
-       meth is_expose: Bool is extern "sdl_evt_is_expose"
-       meth is_quit: Bool is extern "sdl_evt_is_quit"
+       fun is_keyboard: Bool is extern "sdl_evt_is_keyboard"
+       fun as_keyboard: SDL_KeyboardEvent is extern "sdl_evt_as_keyboard"
+       fun is_mouse_button: Bool is extern "sdl_evt_is_mouse_button"
+       fun as_mouse_button: SDL_MouseButtonEvent is extern "sdl_evt_as_mouse_button"
+       fun is_mouse_motion: Bool is extern "sdl_evt_is_mouse_motion"
+       fun as_mouse_motion: SDL_MouseMotionEvent is extern "sdl_evt_as_mouse_motion"
+       fun is_expose: Bool is extern "sdl_evt_is_expose"
+       fun is_quit: Bool is extern "sdl_evt_is_quit"

 end
 
 universal SDL_ButtonEvent
 special SDL_Event
 end
 
 universal SDL_ButtonEvent
 special SDL_Event

-       meth is_pressed: Bool is abstract
+       fun is_pressed: Bool is abstract

 end
 
 universal SDL_MouseEvent
 special SDL_Event
 end
 
 universal SDL_MouseEvent
 special SDL_Event

-       meth x: Int is abstract
-       meth y: Int is abstract
+       fun x: Int is abstract
+       fun y: Int is abstract

 end
 
 universal SDL_KeyboardEvent
 special SDL_ButtonEvent
 end
 
 universal SDL_KeyboardEvent
 special SDL_ButtonEvent

-       redef meth is_pressed: Bool is extern "sdl_keyboard_evt_state"
+       redef fun is_pressed: Bool is extern "sdl_keyboard_evt_state"

 end
 
 universal SDL_MouseButtonEvent
 special SDL_ButtonEvent
 special SDL_MouseEvent
 end
 
 universal SDL_MouseButtonEvent
 special SDL_ButtonEvent
 special SDL_MouseEvent

-       redef meth is_pressed: Bool is extern "sdl_mouse_button_evt_state"
-       redef meth x: Int is extern "sdl_mouse_button_evt_x"
-       redef meth y: Int is extern "sdl_mouse_button_evt_y"
-       meth button: Int is extern "sdl_mouse_button_evt_button"
+       redef fun is_pressed: Bool is extern "sdl_mouse_button_evt_state"
+       redef fun x: Int is extern "sdl_mouse_button_evt_x"
+       redef fun y: Int is extern "sdl_mouse_button_evt_y"
+       fun button: Int is extern "sdl_mouse_button_evt_button"

 end
 
 universal SDL_MouseMotionEvent
 special SDL_MouseEvent
 end
 
 universal SDL_MouseMotionEvent
 special SDL_MouseEvent

-       redef meth x: Int is extern "sdl_mouse_evt_x"
-       redef meth y: Int is extern "sdl_mouse_evt_y"
-       meth xrel: Int is extern "sdl_mouse_evt_xrel"
-       meth yrel: Int is extern "sdl_mouse_evt_yrel"
+       redef fun x: Int is extern "sdl_mouse_evt_x"
+       redef fun y: Int is extern "sdl_mouse_evt_y"
+       fun xrel: Int is extern "sdl_mouse_evt_xrel"
+       fun yrel: Int is extern "sdl_mouse_evt_yrel"

 end
 
 class SDL_EventListener
 end
 
 class SDL_EventListener

-       meth on_keyboard(evt: SDL_KeyboardEvent)
+       fun on_keyboard(evt: SDL_KeyboardEvent)

        do end
        
        do end
        

-       meth on_mouse_button(evt: SDL_MouseButtonEvent)
+       fun on_mouse_button(evt: SDL_MouseButtonEvent)

        do end
 
        do end
 

-       meth on_mouse_motion(evt: SDL_MouseMotionEvent)
+       fun on_mouse_motion(evt: SDL_MouseMotionEvent)

        do end
 
        do end
 

-       meth on_expose
+       fun on_expose

        do end
 
        do end
 

-       meth on_quit
+       fun on_quit

        do end
 end
 
 class SDL_EventProcessor
        do end
 end
 
 class SDL_EventProcessor

-       attr _listeners: Array[SDL_EventListener]
+       var _listeners: Array[SDL_EventListener]

 
 

-       meth add_listener(l: SDL_EventListener)
+       fun add_listener(l: SDL_EventListener)

        do
                _listeners.add(l)
        end
 
        do
                _listeners.add(l)
        end
 

-       meth remove_listener(l: SDL_EventListener)
+       fun remove_listener(l: SDL_EventListener)

        do
                _listeners.remove(l)
        end
        
        do
                _listeners.remove(l)
        end
        

-       meth process_one_event
+       fun process_one_event

        do
                if sdl_poll_next_event then
                        process_event(sdl_current_event)
                end
        end
 
        do
                if sdl_poll_next_event then
                        process_event(sdl_current_event)
                end
        end
 

-       meth process_all_events
+       fun process_all_events

        do
                while sdl_poll_next_event do
                        process_event(sdl_current_event)
                end
        end
        
        do
                while sdl_poll_next_event do
                        process_event(sdl_current_event)
                end
        end
        

-       private meth process_event(evt: SDL_Event)
+       private fun process_event(evt: SDL_Event)

        do
                var sdl_listeners = _listeners
                if evt.is_keyboard then
        do
                var sdl_listeners = _listeners
                if evt.is_keyboard then

@@ -164,18 +164,18 @@ end
 
 # General
 
 
 # General
 

-meth sdl_init is extern
+fun sdl_init is extern

 
 # Video
 
 
 # Video
 

-meth sdl_set_video_mode(w: Int, h: Int, d: Int): SDL_Screen is extern
-meth sdl_set_fullscreen_video_mode(w: Int, h: Int, d: Int): SDL_Screen is extern
+fun sdl_set_video_mode(w: Int, h: Int, d: Int): SDL_Screen is extern
+fun sdl_set_fullscreen_video_mode(w: Int, h: Int, d: Int): SDL_Screen is extern

 
 

-meth sdl_load_raw_bmp(s: String): SDL_Surface
+fun sdl_load_raw_bmp(s: String): SDL_Surface

 do
        return sdl_load_bmp_native(s.to_cstring)
 end
 do
        return sdl_load_bmp_native(s.to_cstring)
 end

-meth sdl_load_bmp(s: String): SDL_Surface
+fun sdl_load_bmp(s: String): SDL_Surface

 do
        var raw = sdl_load_raw_bmp(s)
        var sprite = raw.to_display_format
 do
        var raw = sdl_load_raw_bmp(s)
        var sprite = raw.to_display_format

@@ -183,22 +183,22 @@ do
        return sprite
 end
 
        return sprite
 end
 

-meth sdl_load_bmp_native(s: NativeString): SDL_Surface is extern
+fun sdl_load_bmp_native(s: NativeString): SDL_Surface is extern

 
 

-meth sdl_show_cursor=(b: Bool) is extern "sdl_show_cursor_1"
-meth sdl_show_cursor: Bool is extern "sdl_show_cursor_0"
+fun sdl_show_cursor=(b: Bool) is extern "sdl_show_cursor_1"
+fun sdl_show_cursor: Bool is extern "sdl_show_cursor_0"

 
 # WM
 
 
 # WM
 

-meth sdl_grab=(b: Bool) is extern "sdl_grab_1"
-meth sdl_grab: Bool is extern "sdl_grab_0"
+fun sdl_grab=(b: Bool) is extern "sdl_grab_1"
+fun sdl_grab: Bool is extern "sdl_grab_0"

 
 # Events
 
 
 # Events
 

-meth sdl_current_event: SDL_Event is extern
-meth sdl_poll_next_event: Bool is extern
+fun sdl_current_event: SDL_Event is extern
+fun sdl_poll_next_event: Bool is extern

 
 # Time
 
 
 # Time
 

-meth sdl_get_ticks: Int is extern
-meth sdl_delay(ms: Int) is extern
+fun sdl_get_ticks: Int is extern
+fun sdl_delay(ms: Int) is extern

diff --git a/lib/standard/abstract_collection.nit b/lib/standard/abstract_collection.nit
index 10fafb7..0d12d90 100644 (file)
--- a/lib/standard/abstract_collection.nit
+++ b/lib/standard/abstract_collection.nit
@@ -40,64 +40,64 @@ import kernel
 # Subclasses may redefine them with an efficient implementation.
 interface Collection[E]
        # Get a new iterator on the collection.
 # Subclasses may redefine them with an efficient implementation.
 interface Collection[E]
        # Get a new iterator on the collection.

-       meth iterator: Iterator[E] is abstract
+       fun iterator: Iterator[E] is abstract

 
        # Is there no item in the collection ?
 
        # Is there no item in the collection ?

-       meth is_empty: Bool is abstract 
+       fun is_empty: Bool is abstract 

 
        # Number of items in the collection.
 
        # Number of items in the collection.

-       meth length: Int is abstract
+       fun length: Int is abstract

 
        # Is `item' in the collection ?
        # Comparaisons are done with ==
 
        # Is `item' in the collection ?
        # Comparaisons are done with ==

-       meth has(item: E): Bool is abstract
+       fun has(item: E): Bool is abstract

 
        # Is the collection contain only `item' ?
        # Comparaisons are done with ==
        # Return true if the collection is empty.
 
        # Is the collection contain only `item' ?
        # Comparaisons are done with ==
        # Return true if the collection is empty.

-       meth has_only(item: E): Bool is abstract
+       fun has_only(item: E): Bool is abstract

 
        # How many occurences of `item' are in the collection ?
        # Comparaisons are done with ==
 
        # How many occurences of `item' are in the collection ?
        # Comparaisons are done with ==

-       meth count(item: E): Int is abstract
+       fun count(item: E): Int is abstract

 
        # Return one the item of the collection
 
        # Return one the item of the collection

-       meth first: E is abstract
+       fun first: E is abstract

 end
 
 # Naive implementation of collections method
 # You only have to define iterator!
 interface NaiveCollection[E]
 special Collection[E]
 end
 
 # Naive implementation of collections method
 # You only have to define iterator!
 interface NaiveCollection[E]
 special Collection[E]

-       redef meth is_empty do return length == 0
+       redef fun is_empty do return length == 0

 
 

-       redef meth length
+       redef fun length

        do
                var nb = 0
                for i in self do nb += nb
                return nb
        end
 
        do
                var nb = 0
                for i in self do nb += nb
                return nb
        end
 

-       redef meth has(item)
+       redef fun has(item)

        do
                for i in self do if i == item then return true
                return false
        end
 
        do
                for i in self do if i == item then return true
                return false
        end
 

-       redef meth has_only(item)
+       redef fun has_only(item)

        do
                for i in self do if i != item then return false
                return true
        end
 
        do
                for i in self do if i != item then return false
                return true
        end
 

-       redef meth count(item)
+       redef fun count(item)

        do
                var nb = 0
                for i in self do if i == item then nb += 1
                return nb
        end
 
        do
                var nb = 0
                for i in self do if i == item then nb += 1
                return nb
        end
 

-       redef meth first
+       redef fun first

        do
                assert length > 0
                return iterator.item
        do
                assert length > 0
                return iterator.item

@@ -109,31 +109,31 @@ end
 interface Iterator[E]
        # The current item.
        # Require `is_ok'.
 interface Iterator[E]
        # The current item.
        # Require `is_ok'.

-       meth item: E is abstract
+       fun item: E is abstract

 
        # Jump to the next item.
        # Require `is_ok'.
 
        # Jump to the next item.
        # Require `is_ok'.

-       meth next is abstract
+       fun next is abstract

 
        # Is there a current item ?
 
        # Is there a current item ?

-       meth is_ok: Bool is abstract
+       fun is_ok: Bool is abstract

 end
 
 # A collection that contains only one item.
 class Container[E]
 special Collection[E]
 
 end
 
 # A collection that contains only one item.
 class Container[E]
 special Collection[E]
 

-       redef meth first do return _item
+       redef fun first do return _item

 
 

-       redef meth is_empty do return false
+       redef fun is_empty do return false

 
 

-       redef meth length do return 1
+       redef fun length do return 1

 
 

-       redef meth has(an_item) do return _item == an_item
+       redef fun has(an_item) do return _item == an_item

 
 

-       redef meth has_only(an_item) do return _item == an_item
+       redef fun has_only(an_item) do return _item == an_item

 
 

-       redef meth count(an_item)
+       redef fun count(an_item)

        do
                if _item == an_item then
                        return 1
        do
                if _item == an_item then
                        return 1

@@ -142,40 +142,40 @@ special Collection[E]
                end
        end
 
                end
        end
 

-       redef meth iterator do return new ContainerIterator[E](self)
+       redef fun iterator do return new ContainerIterator[E](self)

 
        # Create a new instance with a given initial value.
        init(e: E) do _item = e
 
        # The stored item
 
        # Create a new instance with a given initial value.
        init(e: E) do _item = e
 
        # The stored item

-       readable writable attr _item: E
+       readable writable var _item: E

 end
 
 # This iterator is quite stupid since it is used for only one item.
 class ContainerIterator[E]
 special Iterator[E]
 end
 
 # This iterator is quite stupid since it is used for only one item.
 class ContainerIterator[E]
 special Iterator[E]

-       redef meth item do return _container.item
+       redef fun item do return _container.item

 
 

-       redef meth next do _is_ok = false
+       redef fun next do _is_ok = false

 
        init(c: Container[E]) do _container = c
 
 
        init(c: Container[E]) do _container = c
 

-       redef readable attr _is_ok: Bool = true
+       redef readable var _is_ok: Bool = true

 
 

-       attr _container: Container[E]
+       var _container: Container[E]

 end
 
 # Items can be removed from this collection
 interface RemovableCollection[E]
 special Collection[E]
        # Remove all items
 end
 
 # Items can be removed from this collection
 interface RemovableCollection[E]
 special Collection[E]
        # Remove all items

-       meth clear is abstract
+       fun clear is abstract

 
        # Remove an occucence of `item'
 
        # Remove an occucence of `item'

-       meth remove(item: E) is abstract
+       fun remove(item: E) is abstract

 
        # Remove all occurences of `item'
 
        # Remove all occurences of `item'

-       meth remove_all(item: E) do while has(item) do remove(item)
+       fun remove_all(item: E) do while has(item) do remove(item)

 end
 
 # Items can be added to these collections.
 end
 
 # Items can be added to these collections.

@@ -183,10 +183,10 @@ interface SimpleCollection[E]
 special RemovableCollection[E]
        # Add an item in a collection.
        # Ensure col.has(item)
 special RemovableCollection[E]
        # Add an item in a collection.
        # Ensure col.has(item)

-       meth add(item: E) is abstract
+       fun add(item: E) is abstract

 
        # Add each item of `coll`.
 
        # Add each item of `coll`.

-       meth add_all(coll: Collection[E]) do for i in coll do add(i)
+       fun add_all(coll: Collection[E]) do for i in coll do add(i)

 end
 
 # Abstract sets.
 end
 
 # Abstract sets.

@@ -201,7 +201,7 @@ end
 interface Set[E]
 special SimpleCollection[E]
 
 interface Set[E]
 special SimpleCollection[E]
 

-       redef meth has_only(item)
+       redef fun has_only(item)

        do
                var l = length
                if l == 1 then
        do
                var l = length
                if l == 1 then

@@ -214,7 +214,7 @@ special SimpleCollection[E]
        end
 
        # Only 0 or 1
        end
 
        # Only 0 or 1

-       redef meth count(item)
+       redef fun count(item)

        do
                if has(item) then
                        return 1
        do
                if has(item) then
                        return 1

@@ -224,18 +224,18 @@ special SimpleCollection[E]
        end
 
        # Synonym of remove since there is only one item
        end
 
        # Synonym of remove since there is only one item

-       redef meth remove_all(item) do remove(item)
+       redef fun remove_all(item) do remove(item)

 end
 
 interface MapRead[K, E]
 special Collection[E]
        # Get the item at `key'.
 end
 
 interface MapRead[K, E]
 special Collection[E]
        # Get the item at `key'.

-       meth [](key: K): E is abstract
+       fun [](key: K): E is abstract

 
        # Is there an item at `key'.
 
        # Is there an item at `key'.

-       meth has_key(key: K): Bool is abstract
+       fun has_key(key: K): Bool is abstract

 
 

-       redef meth iterator: MapIterator[K, E] is abstract
+       redef fun iterator: MapIterator[K, E] is abstract

 end
 
 # Maps are associative collections: `key' -> `item'.
 end
 
 # Maps are associative collections: `key' -> `item'.

@@ -254,14 +254,14 @@ interface Map[K, E]
 special RemovableCollection[E]
 special MapRead[K, E]
        # Set the`item' at `key'.
 special RemovableCollection[E]
 special MapRead[K, E]
        # Set the`item' at `key'.

-       meth []=(key: K, item: E) is abstract
+       fun []=(key: K, item: E) is abstract

 
        # Remove the item at `key'
 
        # Remove the item at `key'

-       meth remove_at(key: K) is abstract
+       fun remove_at(key: K) is abstract

 
        # Add each (key,value) of `map' into `self'.
        # If a same key exists in `map' and `self', then the value in self is discarded.
 
        # Add each (key,value) of `map' into `self'.
        # If a same key exists in `map' and `self', then the value in self is discarded.

-       meth recover_with(map: Map[K, E])
+       fun recover_with(map: Map[K, E])

        do
                var i = map.iterator
                while i.is_ok do
        do
                var i = map.iterator
                while i.is_ok do

@@ -275,10 +275,10 @@ end
 interface MapIterator[K, E]
 special Iterator[E]
        # The key of the current item.
 interface MapIterator[K, E]
 special Iterator[E]
        # The key of the current item.

-       meth key: K is abstract
+       fun key: K is abstract

 
        # Set a new `item' at `key'.
 
        # Set a new `item' at `key'.

-       #meth item=(item: E) is abstract
+       #fun item=(item: E) is abstract

 end
 
 # Indexed collection are ordoned collections.
 end
 
 # Indexed collection are ordoned collections.

@@ -287,7 +287,7 @@ interface IndexedCollectionRead[E]
 special MapRead[Int, E]
        # Get the first item.
        # Is equivalent with `self'[0].
 special MapRead[Int, E]
        # Get the first item.
        # Is equivalent with `self'[0].

-       redef meth first
+       redef fun first

        do
                assert not_empty: not is_empty
                return self[0]
        do
                assert not_empty: not is_empty
                return self[0]

@@ -295,7 +295,7 @@ special MapRead[Int, E]
        
        # Get the last item.
        # Is equivalent with `self'[`length'-1].
        
        # Get the last item.
        # Is equivalent with `self'[`length'-1].

-       meth last: E
+       fun last: E

        do
                assert not_empty: not is_empty
                return self[length-1]
        do
                assert not_empty: not is_empty
                return self[length-1]

@@ -303,7 +303,7 @@ special MapRead[Int, E]
 
        # Return the index of the first occurence of `item'.
        # Return -1 if `item' is not found
 
        # Return the index of the first occurence of `item'.
        # Return -1 if `item' is not found

-       meth index_of(item: E): Int
+       fun index_of(item: E): Int

        do
                var i = iterator
                while i.is_ok do
        do
                var i = iterator
                while i.is_ok do

@@ -313,7 +313,7 @@ special MapRead[Int, E]
                return -1
        end
 
                return -1
        end
 

-       redef meth iterator: IndexedIterator[E] is abstract
+       redef fun iterator: IndexedIterator[E] is abstract

 end
 
 # Indexed collection are ordoned collections.
 end
 
 # Indexed collection are ordoned collections.

@@ -324,12 +324,12 @@ special Map[Int, E]
 special SimpleCollection[E]
        # Set the first item.
        # Is equivalent with `self'[0] = `item'.
 special SimpleCollection[E]
        # Set the first item.
        # Is equivalent with `self'[0] = `item'.

-       meth first=(item: E)
+       fun first=(item: E)

        do self[0] = item end
 
        # Set the last item.
        # Is equivalent with `self'[length-1] = `item'.
        do self[0] = item end
 
        # Set the last item.
        # Is equivalent with `self'[length-1] = `item'.

-       meth last=(item: E) 
+       fun last=(item: E) 

        do 
                var l = length
                if l > 0 then
        do 
                var l = length
                if l > 0 then

@@ -340,23 +340,23 @@ special SimpleCollection[E]
        end
 
        # A synonym of `push'
        end
 
        # A synonym of `push'

-       redef meth add(e) do push(e)
+       redef fun add(e) do push(e)

 
        # Add an item after the last.
 
        # Add an item after the last.

-       meth push(e: E) is abstract
+       fun push(e: E) is abstract

 
        # Add each item of `coll` after the last.
 
        # Add each item of `coll` after the last.

-       meth append(coll: Collection[E]) do for i in coll do push(i)
+       fun append(coll: Collection[E]) do for i in coll do push(i)

 
        # Remove the last item.
 
        # Remove the last item.

-       meth pop: E is abstract
+       fun pop: E is abstract

 
        # Add an item before the last.
 
        # Add an item before the last.

-       meth unshift(e: E) is abstract
+       fun unshift(e: E) is abstract

 
        # Remove the first item.
        # The second item become the first.
 
        # Remove the first item.
        # The second item become the first.

-       meth shift: E is abstract
+       fun shift: E is abstract

 
 end
 
 
 end
 

@@ -364,10 +364,10 @@ end
 interface IndexedIterator[E]
 special MapIterator[Int, E]
        # The index of the current item.
 interface IndexedIterator[E]
 special MapIterator[Int, E]
        # The index of the current item.

-       meth index: Int is abstract
+       fun index: Int is abstract

 
        # A synonym of index.
 
        # A synonym of index.

-       redef meth key do return index
+       redef fun key do return index

 end
 
 # Associatives arrays that internally uses couples to represent each (key, value) pairs.
 end
 
 # Associatives arrays that internally uses couples to represent each (key, value) pairs.

@@ -375,9 +375,9 @@ interface CoupleMap[K, E]
 special Map[K, E]
        # Return the couple of the corresponding key
        # Return null if the key is no associated element
 special Map[K, E]
        # Return the couple of the corresponding key
        # Return null if the key is no associated element

-       protected meth couple_at(key: K): nullable Couple[K, E] is abstract
+       protected fun couple_at(key: K): nullable Couple[K, E] is abstract

 
 

-       redef meth [](key)
+       redef fun [](key)

        do
                var c = couple_at(key)
                if c == null then
        do
                var c = couple_at(key)
                if c == null then

@@ -387,7 +387,7 @@ special Map[K, E]
                end
        end
 
                end
        end
 

-       redef meth has_key(key) do return couple_at(key) != null
+       redef fun has_key(key) do return couple_at(key) != null

 end
 
 # Iterator on CoupleMap
 end
 
 # Iterator on CoupleMap

@@ -395,20 +395,20 @@ end
 # Actually is is a wrapper around an iterator of the internal array of the map.
 class CoupleMapIterator[K, E]
 special MapIterator[K, E]
 # Actually is is a wrapper around an iterator of the internal array of the map.
 class CoupleMapIterator[K, E]
 special MapIterator[K, E]

-       redef meth item do return _iter.item.second
+       redef fun item do return _iter.item.second

        
        

-       #redef meth item=(e) do _iter.item.second = e
+       #redef fun item=(e) do _iter.item.second = e

 
 

-       redef meth key do return _iter.item.first
+       redef fun key do return _iter.item.first

 
 

-       redef meth is_ok do return _iter.is_ok
+       redef fun is_ok do return _iter.is_ok

 
 

-       redef meth next
+       redef fun next

        do 
                _iter.next
        end
 
        do 
                _iter.next
        end
 

-       attr _iter: Iterator[Couple[K,E]]
+       var _iter: Iterator[Couple[K,E]]

 
        init(i: Iterator[Couple[K,E]]) do _iter = i
 end
 
        init(i: Iterator[Couple[K,E]]) do _iter = i
 end

@@ -419,10 +419,10 @@ end
 class Couple[F, S]
 
        # The first element of the couple.
 class Couple[F, S]
 
        # The first element of the couple.

-       readable writable attr _first: F
+       readable writable var _first: F

 
        # The second element of the couple.
 
        # The second element of the couple.

-       readable writable attr _second: S
+       readable writable var _second: S

 
        # Create a new instance with a first and a second object.
        init(f: F, s: S)
 
        # Create a new instance with a first and a second object.
        init(f: F, s: S)

diff --git a/lib/standard/array.nit b/lib/standard/array.nit
index a4b7190..569140e 100644 (file)
--- a/lib/standard/array.nit
+++ b/lib/standard/array.nit
@@ -21,11 +21,11 @@ import abstract_collection
 class AbstractArrayRead[E]
 special IndexedCollectionRead[E]
        # The current length
 class AbstractArrayRead[E]
 special IndexedCollectionRead[E]
        # The current length

-       redef readable attr _length: Int = 0
+       redef readable var _length: Int = 0

 
 

-       redef meth is_empty do return _length == 0
+       redef fun is_empty do return _length == 0

 
 

-       redef meth has(item)
+       redef fun has(item)

        do
                var i = 0
                var l = length
        do
                var i = 0
                var l = length

@@ -36,7 +36,7 @@ special IndexedCollectionRead[E]
                return false
        end
 
                return false
        end
 

-       redef meth has_only(item)
+       redef fun has_only(item)

        do
                var i = 0
                var l = length
        do
                var i = 0
                var l = length

@@ -47,9 +47,9 @@ special IndexedCollectionRead[E]
                return true
        end
 
                return true
        end
 

-       redef meth has_key(index) do return index >= 0 and index < length
+       redef fun has_key(index) do return index >= 0 and index < length

 
 

-       redef meth count(item)
+       redef fun count(item)

        do
                var res = 0
                var i = 0
        do
                var res = 0
                var i = 0

@@ -61,11 +61,11 @@ special IndexedCollectionRead[E]
                return res
        end
 
                return res
        end
 

-       redef meth index_of(item) do return index_of_from(item, 0)
+       redef fun index_of(item) do return index_of_from(item, 0)

 
 

-       meth last_index_of(item: E): Int do return last_index_of_from(item, length-1)
+       fun last_index_of(item: E): Int do return last_index_of_from(item, length-1)

 
 

-       meth index_of_from(item: E, pos: Int): Int
+       fun index_of_from(item: E, pos: Int): Int

        do
                var i = pos
                var len = length
        do
                var i = pos
                var len = length

@@ -78,7 +78,7 @@ special IndexedCollectionRead[E]
                return -1
        end
 
                return -1
        end
 

-       meth last_index_of_from(item: E, pos: Int): Int
+       fun last_index_of_from(item: E, pos: Int): Int

        do
                var i = pos
                while i >= 0 do
        do
                var i = pos
                while i >= 0 do

@@ -91,7 +91,7 @@ special IndexedCollectionRead[E]
                return -1
        end
 
                return -1
        end
 

-       meth reversed: Array[E]
+       fun reversed: Array[E]

        do
                var cmp = _length
                var result = new Array[E].with_capacity(cmp)
        do
                var cmp = _length
                var result = new Array[E].with_capacity(cmp)

@@ -102,7 +102,7 @@ special IndexedCollectionRead[E]
                return result
        end
 
                return result
        end
 

-       protected meth copy_to(start: Int, len: Int, dest: AbstractArray[E], new_start: Int)
+       protected fun copy_to(start: Int, len: Int, dest: AbstractArray[E], new_start: Int)

        do
                # TODO native one
                var i = len
        do
                # TODO native one
                var i = len

@@ -112,7 +112,7 @@ special IndexedCollectionRead[E]
                end
        end
 
                end
        end
 

-       redef meth output
+       redef fun output

        do
                var i = 0
                var l = length
        do
                var i = 0
                var l = length

@@ -123,10 +123,10 @@ special IndexedCollectionRead[E]
                end
        end
 
                end
        end
 

-       redef meth iterator: ArrayIterator[E] do return new ArrayIterator[E](self)
+       redef fun iterator: ArrayIterator[E] do return new ArrayIterator[E](self)

 
        # Two arrays are equals if they have the same items in the same order.
 
        # Two arrays are equals if they have the same items in the same order.

-       redef meth ==(o)
+       redef fun ==(o)

        do
                if not o isa AbstractArray[E] or o is null then return false
                var l = length
        do
                if not o isa AbstractArray[E] or o is null then return false
                var l = length

@@ -144,11 +144,11 @@ end
 class AbstractArray[E]
 special AbstractArrayRead[E]
 special IndexedCollection[E]
 class AbstractArray[E]
 special AbstractArrayRead[E]
 special IndexedCollection[E]

-       meth enlarge(cap: Int) is abstract
+       fun enlarge(cap: Int) is abstract

 
 

-       redef meth push(item) do add(item)
+       redef fun push(item) do add(item)

 
 

-       redef meth pop
+       redef fun pop

        do
                assert not_empty: not is_empty
                var r = last
        do
                assert not_empty: not is_empty
                var r = last

@@ -156,7 +156,7 @@ special IndexedCollection[E]
                return r
        end
 
                return r
        end
 

-       redef meth shift
+       redef fun shift

        do
                assert not_empty: not is_empty
                var r = first
        do
                assert not_empty: not is_empty
                var r = first

@@ -170,7 +170,7 @@ special IndexedCollection[E]
                return r
        end
 
                return r
        end
 

-       redef meth unshift(item)
+       redef fun unshift(item)

        do
                var i = length - 1
                while i > 0 do
        do
                var i = length - 1
                while i > 0 do

@@ -180,20 +180,20 @@ special IndexedCollection[E]
                self[0] = item
        end
 
                self[0] = item
        end
 

-       meth insert(item: E, pos: Int)
+       fun insert(item: E, pos: Int)

        do
                enlarge(length + 1)
                copy_to(pos, length-pos, self, pos + 1)
                self[pos] = item
        end
 
        do
                enlarge(length + 1)
                copy_to(pos, length-pos, self, pos + 1)
                self[pos] = item
        end
 

-       redef meth add(item) do self[length] = item
+       redef fun add(item) do self[length] = item

 
 

-       redef meth clear do _length = 0
+       redef fun clear do _length = 0

 
 

-       redef meth remove(item) do remove_at(index_of(item))
+       redef fun remove(item) do remove_at(index_of(item))

 
 

-       redef meth remove_all(item)
+       redef fun remove_all(item)

        do
                var i = index_of(item)
                while i >= 0 do
        do
                var i = index_of(item)
                while i >= 0 do

@@ -202,7 +202,7 @@ special IndexedCollection[E]
                end
        end
 
                end
        end
 

-       redef meth remove_at(i)
+       redef fun remove_at(i)

        do
                var l = length
                if i >= 0 and i < l then
        do
                var l = length
                if i >= 0 and i < l then

@@ -228,13 +228,13 @@ end
 class Array[E]
 special AbstractArray[E]
 special ArrayCapable[E]
 class Array[E]
 special AbstractArray[E]
 special ArrayCapable[E]

-       redef meth [](index)
+       redef fun [](index)

        do
                assert index: index >= 0 and index < _length
                return _items[index]
        end
 
        do
                assert index: index >= 0 and index < _length
                return _items[index]
        end
 

-       redef meth []=(index, item)
+       redef fun []=(index, item)

        do
                assert index: index >= 0 and index < _length + 1
                if _capacity <= index then
        do
                assert index: index >= 0 and index < _length + 1
                if _capacity <= index then

@@ -246,7 +246,7 @@ special ArrayCapable[E]
                _items[index] = item
        end
 
                _items[index] = item
        end
 

-       redef meth enlarge(cap)
+       redef fun enlarge(cap)

        do
                var c = _capacity
                if cap <= c then return
        do
                var c = _capacity
                if cap <= c then return

@@ -305,22 +305,22 @@ special ArrayCapable[E]
        end
 
        # The internal storage.
        end
 
        # The internal storage.

-       attr _items: nullable NativeArray[E] = null
+       var _items: nullable NativeArray[E] = null

 
        # The size of `_items'.
 
        # The size of `_items'.

-       attr _capacity: Int = 0
+       var _capacity: Int = 0

 end
 
 # An `Iterator' on `AbstractArray'
 class ArrayIterator[E]
 special IndexedIterator[E]
 end
 
 # An `Iterator' on `AbstractArray'
 class ArrayIterator[E]
 special IndexedIterator[E]

-       redef meth item do return _array[_index]
+       redef fun item do return _array[_index]

 
 

-       # redef meth item=(e) do _array[_index] = e
+       # redef fun item=(e) do _array[_index] = e

 
 

-       redef meth is_ok do return _index < _array.length
+       redef fun is_ok do return _index < _array.length

 
 

-       redef meth next do _index += 1
+       redef fun next do _index += 1

 
        init(a: AbstractArrayRead[E])
        do
 
        init(a: AbstractArrayRead[E])
        do

@@ -328,8 +328,8 @@ special IndexedIterator[E]
                _index = 0
        end
 
                _index = 0
        end
 

-       redef readable attr _index: Int = 0
-       attr _array: AbstractArrayRead[E]
+       redef readable var _index: Int = 0
+       var _array: AbstractArrayRead[E]

 end
 
 # Others collections ##########################################################
 end
 
 # Others collections ##########################################################

@@ -338,38 +338,38 @@ end
 class ArraySet[E]
 special Set[E]
        # The stored elements.
 class ArraySet[E]
 special Set[E]
        # The stored elements.

-       attr _array: Array[E]
+       var _array: Array[E]

 
 

-       redef meth has(e) do return _array.has(e)
+       redef fun has(e) do return _array.has(e)

 
 

-       redef meth add(e) do if not _array.has(e) then _array.add(e)
+       redef fun add(e) do if not _array.has(e) then _array.add(e)

 
 

-       redef meth is_empty do return _array.is_empty
+       redef fun is_empty do return _array.is_empty

 
 

-       redef meth length do return _array.length
+       redef fun length do return _array.length

 
 

-       redef meth first
+       redef fun first

        do
                assert _array.length > 0
                return _array.first
        end
 
        do
                assert _array.length > 0
                return _array.first
        end
 

-       redef meth remove(item)
+       redef fun remove(item)

        do
                var i = _array.index_of(item)
                if i >= 0 then remove_at(i)
        end
 
        do
                var i = _array.index_of(item)
                if i >= 0 then remove_at(i)
        end
 

-       redef meth remove_all(item) do remove(item)
+       redef fun remove_all(item) do remove(item)

 
 

-       redef meth clear do _array.clear
+       redef fun clear do _array.clear

 
 

-       redef meth iterator do return new ArraySetIterator[E](_array.iterator)
+       redef fun iterator do return new ArraySetIterator[E](_array.iterator)

 
        # Assume the capacitydd is at least `cap'.
 
        # Assume the capacitydd is at least `cap'.

-       meth enlarge(cap: Int) do _array.enlarge(cap)
+       fun enlarge(cap: Int) do _array.enlarge(cap)

 
 

-       private meth remove_at(i: Int)
+       private fun remove_at(i: Int)

        do
                _array[i] = _array.last
                _array.pop
        do
                _array[i] = _array.last
                _array.pop

@@ -386,15 +386,15 @@ end
 class ArraySetIterator[E]
 special Iterator[E]
 
 class ArraySetIterator[E]
 special Iterator[E]
 

-       redef meth is_ok do return _iter.is_ok
+       redef fun is_ok do return _iter.is_ok

 
 

-       redef meth next do _iter.next
+       redef fun next do _iter.next

 
 

-       redef meth item: E do return _iter.item
+       redef fun item: E do return _iter.item

 
        init(iter: ArrayIterator[E]) do _iter = iter
 
 
        init(iter: ArrayIterator[E]) do _iter = iter
 

-       attr _iter: ArrayIterator[E]
+       var _iter: ArrayIterator[E]

 end
 
 
 end
 
 

@@ -403,7 +403,7 @@ class ArrayMap[K, E]
 special CoupleMap[K, E]
 
        # O(n)
 special CoupleMap[K, E]
 
        # O(n)

-       redef meth [](key)
+       redef fun [](key)

        do
                var i = index(key)
                if i >= 0 then
        do
                var i = index(key)
                if i >= 0 then

@@ -414,7 +414,7 @@ special CoupleMap[K, E]
        end
 
        # O(n)
        end
 
        # O(n)

-       redef meth []=(key, item)
+       redef fun []=(key, item)

        do
                var i = index(key)
                if i >= 0 then
        do
                var i = index(key)
                if i >= 0 then

@@ -425,40 +425,40 @@ special CoupleMap[K, E]
        end
 
        # O(n)
        end
 
        # O(n)

-       redef meth has_key(key) do return index(key) >= 0
+       redef fun has_key(key) do return index(key) >= 0

 
        # O(n)
 
        # O(n)

-       redef meth has(item)
+       redef fun has(item)

        do
                for i in _items do if i.second == item then return true
                return false
        end
 
        # O(n)
        do
                for i in _items do if i.second == item then return true
                return false
        end
 
        # O(n)

-       redef meth has_only(item)
+       redef fun has_only(item)

        do
                for i in _items do if i.second != item then return false
                return true
        end
 
        # O(1)
        do
                for i in _items do if i.second != item then return false
                return true
        end
 
        # O(1)

-       redef meth length do return _items.length
+       redef fun length do return _items.length

 
 

-       redef meth first do return _items.first.first
+       redef fun first do return _items.first.first

 
        # O(n)
 
        # O(n)

-       redef meth count(item)
+       redef fun count(item)

        do
                var nb = 0
                for i in _items do if i.second == item then nb += 1
                return nb
        end
 
        do
                var nb = 0
                for i in _items do if i.second == item then nb += 1
                return nb
        end
 

-       redef meth iterator: CoupleMapIterator[K, E] do return new CoupleMapIterator[K, E](_items.iterator)
+       redef fun iterator: CoupleMapIterator[K, E] do return new CoupleMapIterator[K, E](_items.iterator)

 
 

-       redef meth is_empty do return _items.is_empty
+       redef fun is_empty do return _items.is_empty

 
 

-       redef meth remove(item)
+       redef fun remove(item)

        do
                var i = _items.length - 1
                while i >= 0 do
        do
                var i = _items.length - 1
                while i >= 0 do

@@ -470,7 +470,7 @@ special CoupleMap[K, E]
                end
        end
 
                end
        end
 

-       redef meth remove_all(item: E)
+       redef fun remove_all(item: E)

        do
                var i = _items.length - 1
                while i >= 0 do
        do
                var i = _items.length - 1
                while i >= 0 do

@@ -481,18 +481,18 @@ special CoupleMap[K, E]
                end
        end
 
                end
        end
 

-       redef meth remove_at(key)
+       redef fun remove_at(key)

        do
                var i = index(key)
                if i >= 0 then remove_at_index(i)
        end
 
        do
                var i = index(key)
                if i >= 0 then remove_at_index(i)
        end
 

-       redef meth clear do _items.clear
+       redef fun clear do _items.clear

 
        # Assume the capacity to be at least `cap'.
 
        # Assume the capacity to be at least `cap'.

-       meth enlarge(cap: Int) do _items.enlarge(cap)
+       fun enlarge(cap: Int) do _items.enlarge(cap)

 
 

-       redef meth couple_at(key)
+       redef fun couple_at(key)

        do
                var i = index(key)
                if i >= 0 then
        do
                var i = index(key)
                if i >= 0 then

@@ -503,21 +503,21 @@ special CoupleMap[K, E]
        end
 
        # Internal storage.
        end
 
        # Internal storage.

-       attr _items: Array[Couple[K,E]]
+       var _items: Array[Couple[K,E]]

 
        # fast remove the ith element of the array
 
        # fast remove the ith element of the array

-       private meth remove_at_index(i: Int)
+       private fun remove_at_index(i: Int)

        do
                _items[i] = _items.last
                _items.pop
        end
 
        # The last positive result given by a index(1) call
        do
                _items[i] = _items.last
                _items.pop
        end
 
        # The last positive result given by a index(1) call

-       attr _last_index: Int = 0
+       var _last_index: Int = 0

 
        # Where is the `key' in `_item'?
        # return -1 if not found
 
        # Where is the `key' in `_item'?
        # return -1 if not found

-       private meth index(key: K): Int
+       private fun index(key: K): Int

        do
                var l = _last_index
                if l < _items.length and _items[l].first == key then return l
        do
                var l = _last_index
                if l < _items.length and _items[l].first == key then return l

@@ -544,7 +544,7 @@ end
 
 redef class Iterator[E]
        # Interate on `self' and build an array
 
 redef class Iterator[E]
        # Interate on `self' and build an array

-       meth to_a: Array[E]
+       fun to_a: Array[E]

        do
                var res = new Array[E]
                while is_ok do
        do
                var res = new Array[E]
                while is_ok do

@@ -557,7 +557,7 @@ end
 
 redef class Collection[E]
        # Build a new array from a collection
 
 redef class Collection[E]
        # Build a new array from a collection

-       meth to_a: Array[E]
+       fun to_a: Array[E]

        do
                return iterator.to_a
        end
        do
                return iterator.to_a
        end

@@ -568,14 +568,14 @@ end
 # Subclasses of this class can create native arrays
 interface ArrayCapable[E]
        # Get a new array of `size' elements.
 # Subclasses of this class can create native arrays
 interface ArrayCapable[E]
        # Get a new array of `size' elements.

-       protected meth calloc_array(size: Int): NativeArray[E] is intern
+       protected fun calloc_array(size: Int): NativeArray[E] is intern

 end
 
 # Native C array (void ...).
 universal NativeArray[E]
 end
 
 # Native C array (void ...).
 universal NativeArray[E]

-       meth [](index: Int): E is intern
-       meth []=(index: Int, item: E) is intern
-       meth copy_to(dest: NativeArray[E], length: Int) is intern
-       #meth =(o: NativeArray[E]): Bool is intern
-       #meth !=(o: NativeArray[E]): Bool is intern
+       fun [](index: Int): E is intern
+       fun []=(index: Int, item: E) is intern
+       fun copy_to(dest: NativeArray[E], length: Int) is intern
+       #fun =(o: NativeArray[E]): Bool is intern
+       #fun !=(o: NativeArray[E]): Bool is intern

 end
 end

diff --git a/lib/standard/environ.nit b/lib/standard/environ.nit
index 6fe9c11..8a0c667 100644 (file)
--- a/lib/standard/environ.nit
+++ b/lib/standard/environ.nit
@@ -17,7 +17,7 @@ import symbol
 
 redef class Symbol
        # Return environement valued for this symbol
 
 redef class Symbol
        # Return environement valued for this symbol

-       meth environ: String
+       fun environ: String

        do
                var res = to_s.to_cstring.get_environ
                # FIXME: There is no proper way to handle NULL C string yet. What a pitty.
        do
                var res = to_s.to_cstring.get_environ
                # FIXME: There is no proper way to handle NULL C string yet. What a pitty.

@@ -34,5 +34,5 @@ end
 
 redef class NativeString
 # Refinned to add environement bindings
 
 redef class NativeString
 # Refinned to add environement bindings

-       private meth get_environ: NativeString is extern "string_NativeString_NativeString_get_environ_0"
+       private fun get_environ: NativeString is extern "string_NativeString_NativeString_get_environ_0"

 end
 end

diff --git a/lib/standard/exec.nit b/lib/standard/exec.nit
index 0bc9783..eda24a9 100644 (file)
--- a/lib/standard/exec.nit
+++ b/lib/standard/exec.nit
@@ -21,30 +21,30 @@ import stream
 class Process
 
        # The pid of the processus
 class Process
 
        # The pid of the processus

-       meth id: Int do return _data.id
+       fun id: Int do return _data.id

 
        # Is the processus finished?
 
        # Is the processus finished?

-       meth is_finished: Bool do return _data.is_finished
+       fun is_finished: Bool do return _data.is_finished

 
        # wait the terminaison of the process
 
        # wait the terminaison of the process

-       meth wait
+       fun wait

        do
                _data.wait
                assert is_finished
        end
        
        # The status once finished
        do
                _data.wait
                assert is_finished
        end
        
        # The status once finished

-       meth status: Int
+       fun status: Int

        do
                assert is_finished
                return _data.status
        end
 
        # send a signal to the process
        do
                assert is_finished
                return _data.status
        end
 
        # send a signal to the process

-       meth kill(signal: Int) do _data.kill(signal)
+       fun kill(signal: Int) do _data.kill(signal)

 
        # send the TERM (15) signal
 
        # send the TERM (15) signal

-       meth term do kill(15)
+       fun term do kill(15)

 
        # launch a command with some arguments
        init(command: String, arguments: String...)
 
        # launch a command with some arguments
        init(command: String, arguments: String...)

@@ -74,21 +74,21 @@ class Process
                _data = basic_exec_execute(command.to_cstring, args.to_s.to_cstring, l, pipeflags)
        end
        
                _data = basic_exec_execute(command.to_cstring, args.to_s.to_cstring, l, pipeflags)
        end
        

-       attr _data: NativeProcess
-       private meth basic_exec_execute(p: NativeString, av: NativeString, ac: Int, pf: Int): NativeProcess is extern "exec_Process_Process_basic_exec_execute_4"
+       var _data: NativeProcess
+       private fun basic_exec_execute(p: NativeString, av: NativeString, ac: Int, pf: Int): NativeProcess is extern "exec_Process_Process_basic_exec_execute_4"

 end
 
 # stdout of the processus is readable
 class IProcess
 special Process
 special IStream
 end
 
 # stdout of the processus is readable
 class IProcess
 special Process
 special IStream

-       attr _in: FDIStream
+       var _in: FDIStream

        
        

-       redef meth close do _in.close
+       redef fun close do _in.close

        
        

-       redef meth read_char do return _in.read_char
+       redef fun read_char do return _in.read_char

 
 

-       redef meth eof do return _in.eof
+       redef fun eof do return _in.eof

 
        init(command: String, arguments: String...)
        do
 
        init(command: String, arguments: String...)
        do

@@ -107,13 +107,13 @@ end
 class OProcess
 special Process
 special OStream
 class OProcess
 special Process
 special OStream

-       attr _out: OStream
+       var _out: OStream

 
 

-       redef meth close do _out.close
+       redef fun close do _out.close

 
 

-       redef meth is_writable do return _out.is_writable
+       redef fun is_writable do return _out.is_writable

 
 

-       redef meth write(s) do _out.write(s)
+       redef fun write(s) do _out.write(s)

        
        init(command: String, arguments: String...)
        do
        
        init(command: String, arguments: String...)
        do

@@ -134,7 +134,7 @@ special IProcess
 special OProcess
 special IOStream
 
 special OProcess
 special IOStream
 

-       redef meth close
+       redef fun close

        do
                _in.close
                _out.close
        do
                _in.close
                _out.close

@@ -157,26 +157,26 @@ end
 
 redef class Sys
        # Execute a shell command and return it's error code
 
 redef class Sys
        # Execute a shell command and return it's error code

-       meth system(command: String): Int
+       fun system(command: String): Int

        do
                return command.to_cstring.system        
        end
 end
 
 redef class NativeString
        do
                return command.to_cstring.system        
        end
 end
 
 redef class NativeString

-       meth system: Int is extern "string_NativeString_NativeString_system_0"
+       fun system: Int is extern "string_NativeString_NativeString_system_0"

 end
 
 private universal NativeProcess
 special Pointer
 end
 
 private universal NativeProcess
 special Pointer

-       meth id: Int is extern "exec_NativeProcess_NativeProcess_id_0"
-       meth is_finished: Bool is extern "exec_NativeProcess_NativeProcess_is_finished_0"
-       meth status: Int is extern "exec_NativeProcess_NativeProcess_status_0"
-       meth wait is extern "exec_NativeProcess_NativeProcess_wait_0"
-       meth kill(s: Int) is extern "exec_NativeProcess_NativeProcess_kill_1"
-
-       meth in_fd: Int is extern "exec_NativeProcess_NativeProcess_in_fd_0"
-       meth out_fd: Int is extern "exec_NativeProcess_NativeProcess_out_fd_0"
-       meth err_fd: Int is extern "exec_NativeProcess_NativeProcess_err_fd_0"
+       fun id: Int is extern "exec_NativeProcess_NativeProcess_id_0"
+       fun is_finished: Bool is extern "exec_NativeProcess_NativeProcess_is_finished_0"
+       fun status: Int is extern "exec_NativeProcess_NativeProcess_status_0"
+       fun wait is extern "exec_NativeProcess_NativeProcess_wait_0"
+       fun kill(s: Int) is extern "exec_NativeProcess_NativeProcess_kill_1"
+
+       fun in_fd: Int is extern "exec_NativeProcess_NativeProcess_in_fd_0"
+       fun out_fd: Int is extern "exec_NativeProcess_NativeProcess_out_fd_0"
+       fun err_fd: Int is extern "exec_NativeProcess_NativeProcess_err_fd_0"

 end
 
 end
 

diff --git a/lib/standard/file.nit b/lib/standard/file.nit
index bbb45d2..5ea2468 100644 (file)
--- a/lib/standard/file.nit
+++ b/lib/standard/file.nit
@@ -23,26 +23,26 @@ redef class Object
 # Simple I/O
 
        # Print `objects' on the standard output (`stdout').
 # Simple I/O
 
        # Print `objects' on the standard output (`stdout').

-       protected meth printn(objects: Object...)
+       protected fun printn(objects: Object...)

        do
                stdout.write(objects.to_s)
        end
 
        # Print an `object' on the standard output (`stdout') and add a newline.
        do
                stdout.write(objects.to_s)
        end
 
        # Print an `object' on the standard output (`stdout') and add a newline.

-       protected meth print(object: Object)
+       protected fun print(object: Object)

        do
                stdout.write(object.to_s)
                stdout.write("\n")
        end
 
        # Read a character from the standard input (`stdin').
        do
                stdout.write(object.to_s)
                stdout.write("\n")
        end
 
        # Read a character from the standard input (`stdin').

-       protected meth getc: Char
+       protected fun getc: Char

        do
                return stdin.read_char.ascii
        end
 
        # Read a line from the standard input (`stdin').
        do
                return stdin.read_char.ascii
        end
 
        # Read a line from the standard input (`stdin').

-       protected meth gets: String
+       protected fun gets: String

        do
                return stdin.read_line
        end
        do
                return stdin.read_line
        end

@@ -53,12 +53,12 @@ class FStream
 special IOS
 special NativeFileCapable
        # The path of the file.
 special IOS
 special NativeFileCapable
        # The path of the file.

-       readable attr _path: nullable String = null
+       readable var _path: nullable String = null

 
        # The FILE *.
 
        # The FILE *.

-       attr _file: nullable NativeFile = null
+       var _file: nullable NativeFile = null

 
 

-       meth file_stat: FileStat
+       fun file_stat: FileStat

        do return _file.file_stat end
 end
 
        do return _file.file_stat end
 end
 

@@ -68,7 +68,7 @@ special FStream
 special BufferedIStream
        # Misc
 
 special BufferedIStream
        # Misc
 

-       meth reopen
+       fun reopen

        do
                if not eof then close
                _file = io_open_read(_path.to_cstring)
        do
                if not eof then close
                _file = io_open_read(_path.to_cstring)

@@ -77,14 +77,14 @@ special BufferedIStream
                _buffer.clear
        end
 
                _buffer.clear
        end
 

-       redef meth close
+       redef fun close

        do
                var i = _file.io_close
                _end_reached = true
        end
 
        # Fill the internal read buffer. Needed by read operations.
        do
                var i = _file.io_close
                _end_reached = true
        end
 
        # Fill the internal read buffer. Needed by read operations.

-       redef meth fill_buffer
+       redef fun fill_buffer

        do
                var nb = _file.io_read(_buffer._items, _buffer._capacity)
                if nb <= 0 then
        do
                var nb = _file.io_read(_buffer._items, _buffer._capacity)
                if nb <= 0 then

@@ -96,7 +96,7 @@ special BufferedIStream
        end
        
        # End of file?
        end
        
        # End of file?

-       redef readable attr _end_reached: Bool = false
+       redef readable var _end_reached: Bool = false

 
        # Open the file at `path' for reading.
        init open(path: String)
 
        # Open the file at `path' for reading.
        init open(path: String)

@@ -117,25 +117,25 @@ special FStream
 special OStream
        
        # Write a string.
 special OStream
        
        # Write a string.

-       redef meth write(s)
+       redef fun write(s)

        do
                assert _writable
                write_native(s.to_cstring, s.length)
        end
 
        do
                assert _writable
                write_native(s.to_cstring, s.length)
        end
 

-       redef meth is_writable do return _writable
+       redef fun is_writable do return _writable

        
        

-       redef meth close
+       redef fun close

        do
                var i = _file.io_close
                _writable = false
        end
 
        # Is the file open in write mode
        do
                var i = _file.io_close
                _writable = false
        end
 
        # Is the file open in write mode

-       attr _writable: Bool
+       var _writable: Bool

        
        # Write `len' bytes from `native'.
        
        # Write `len' bytes from `native'.

-       private meth write_native(native: NativeString, len: Int)
+       private fun write_native(native: NativeString, len: Int)

        do
                assert _writable
                var err = _file.io_write(native, len)
        do
                assert _writable
                var err = _file.io_write(native, len)

@@ -191,13 +191,13 @@ end
 
 redef class String
        # return true if a file with this names exists
 
 redef class String
        # return true if a file with this names exists

-       meth file_exists: Bool do return to_cstring.file_exists
+       fun file_exists: Bool do return to_cstring.file_exists

 
 

-       meth file_stat: FileStat do return to_cstring.file_stat
+       fun file_stat: FileStat do return to_cstring.file_stat

 
 

-       meth file_delete: Bool do return to_cstring.file_delete
+       fun file_delete: Bool do return to_cstring.file_delete

 
 

-       meth strip_extension(ext: String): String
+       fun strip_extension(ext: String): String

        do
                if has_suffix(ext) then
                        return substring(0, length - ext.length)
        do
                if has_suffix(ext) then
                        return substring(0, length - ext.length)

@@ -205,7 +205,7 @@ redef class String
                return self
        end
 
                return self
        end
 

-       meth basename(ext: String): String
+       fun basename(ext: String): String

        do
                var pos = last_index_of_from('/', _length - 1)
                var n = self
        do
                var pos = last_index_of_from('/', _length - 1)
                var n = self

@@ -215,7 +215,7 @@ redef class String
                return n.strip_extension(ext)
        end
 
                return n.strip_extension(ext)
        end
 

-       meth dirname: String
+       fun dirname: String

        do
                var pos = last_index_of_from('/', _length - 1)
                if pos >= 0 then
        do
                var pos = last_index_of_from('/', _length - 1)
                if pos >= 0 then

@@ -225,7 +225,7 @@ redef class String
                end
        end
 
                end
        end
 

-       meth file_path: String
+       fun file_path: String

        do
                var l = _length
                var pos = last_index_of_from('/', l - 1)
        do
                var l = _length
                var pos = last_index_of_from('/', l - 1)

@@ -236,7 +236,7 @@ redef class String
        end
 
        # Create a directory (and all intermediate directories if needed)
        end
 
        # Create a directory (and all intermediate directories if needed)

-       meth mkdir
+       fun mkdir

        do
                var dirs = self.split_with("/")
                var path = new Buffer
        do
                var dirs = self.split_with("/")
                var path = new Buffer

@@ -255,44 +255,44 @@ redef class String
 end
 
 redef class NativeString
 end
 
 redef class NativeString

-       private meth file_exists: Bool is extern "string_NativeString_NativeString_file_exists_0"
-       private meth file_stat: FileStat is extern "string_NativeString_NativeString_file_stat_0"
-       private meth file_mkdir: Bool is extern "string_NativeString_NativeString_file_mkdir_0"
-       private meth file_delete: Bool is extern "string_NativeString_NativeString_file_delete_0"
+       private fun file_exists: Bool is extern "string_NativeString_NativeString_file_exists_0"
+       private fun file_stat: FileStat is extern "string_NativeString_NativeString_file_stat_0"
+       private fun file_mkdir: Bool is extern "string_NativeString_NativeString_file_mkdir_0"
+       private fun file_delete: Bool is extern "string_NativeString_NativeString_file_delete_0"

 end
 
 universal FileStat
 special Pointer
 # This class is system dependent ... must reify the vfs
 end
 
 universal FileStat
 special Pointer
 # This class is system dependent ... must reify the vfs

-       meth mode: Int is extern "file_FileStat_FileStat_mode_0"
-       meth atime: Int is extern "file_FileStat_FileStat_atime_0"
-       meth ctime: Int is extern "file_FileStat_FileStat_ctime_0"
-       meth mtime: Int is extern "file_FileStat_FileStat_mtime_0"
-       meth size: Int is extern "file_FileStat_FileStat_size_0"
+       fun mode: Int is extern "file_FileStat_FileStat_mode_0"
+       fun atime: Int is extern "file_FileStat_FileStat_atime_0"
+       fun ctime: Int is extern "file_FileStat_FileStat_ctime_0"
+       fun mtime: Int is extern "file_FileStat_FileStat_mtime_0"
+       fun size: Int is extern "file_FileStat_FileStat_size_0"

 end
 
 # Instance of this class are standard FILE * pointers
 private universal NativeFile
 special Pointer
 end
 
 # Instance of this class are standard FILE * pointers
 private universal NativeFile
 special Pointer

-       meth io_read(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_read_2"
-       meth io_write(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_write_2"
-       meth io_close: Int is extern "file_NativeFile_NativeFile_io_close_0"
-       meth file_stat: FileStat is extern "file_NativeFile_NativeFile_file_stat_0"
+       fun io_read(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_read_2"
+       fun io_write(buf: NativeString, len: Int): Int is extern "file_NativeFile_NativeFile_io_write_2"
+       fun io_close: Int is extern "file_NativeFile_NativeFile_io_close_0"
+       fun file_stat: FileStat is extern "file_NativeFile_NativeFile_file_stat_0"

 end
 
 private interface NativeFileCapable
 end
 
 private interface NativeFileCapable

-       meth io_open_read(path: NativeString): NativeFile is extern "file_NativeFileCapable_NativeFileCapable_io_open_read_1"
-       meth io_open_write(path: NativeString): NativeFile is extern "file_NativeFileCapable_NativeFileCapable_io_open_write_1"
-       meth native_stdin: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stdin_0"
-       meth native_stdout: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stdout_0"
-       meth native_stderr: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stderr_0"
+       fun io_open_read(path: NativeString): NativeFile is extern "file_NativeFileCapable_NativeFileCapable_io_open_read_1"
+       fun io_open_write(path: NativeString): NativeFile is extern "file_NativeFileCapable_NativeFileCapable_io_open_write_1"
+       fun native_stdin: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stdin_0"
+       fun native_stdout: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stdout_0"
+       fun native_stderr: NativeFile is extern "file_NativeFileCapable_NativeFileCapable_native_stderr_0"

 end
 
 # Standard input.
 end
 
 # Standard input.

-meth stdin: IFStream do return once new Stdin
+fun stdin: IFStream do return once new Stdin

 
 # Standard output.
 
 # Standard output.

-meth stdout: OFStream do return once new Stdout
+fun stdout: OFStream do return once new Stdout

 
 # Standard output for error.
 
 # Standard output for error.

-meth stderr: OFStream do return once new Stderr
+fun stderr: OFStream do return once new Stderr

diff --git a/lib/standard/hash.nit b/lib/standard/hash.nit
index 363c38a..8d46875 100644 (file)
--- a/lib/standard/hash.nit
+++ b/lib/standard/hash.nit
@@ -22,11 +22,11 @@ redef class Object
        # Assuming that a = b -> a.hash = b.hash
        ##
        # Without redefinition, it is the `id' of the instance.
        # Assuming that a = b -> a.hash = b.hash
        ##
        # Without redefinition, it is the `id' of the instance.

-       meth hash: Int do return object_id / 8
+       fun hash: Int do return object_id / 8

 end
 
 redef class String
 end
 
 redef class String

-       redef meth hash
+       redef fun hash

        do
                # djb2 hash algorythm
                var h = 5381
        do
                # djb2 hash algorythm
                var h = 5381

@@ -42,15 +42,15 @@ redef class String
 end
 
 redef class Int
 end
 
 redef class Int

-       redef meth hash do return self
+       redef fun hash do return self

 end
 
 redef class Char
 end
 
 redef class Char

-       redef meth hash do return ascii
+       redef fun hash do return ascii

 end
 
 redef class Bool
 end
 
 redef class Bool

-       redef meth hash
+       redef fun hash

        do
                if self then
                        return 1
        do
                if self then
                        return 1

@@ -64,21 +64,21 @@ end
 private class HashCollection[K: Object, N: HashNode[K], E]
 special Collection[E]
 special ArrayCapable[nullable N]
 private class HashCollection[K: Object, N: HashNode[K], E]
 special Collection[E]
 special ArrayCapable[nullable N]

-       attr _array: nullable NativeArray[nullable N] = null # Used to store items
-       attr _capacity: Int = 0 # Size of _array
-       redef readable attr _length: Int = 0 # Number of items in the map
+       var _array: nullable NativeArray[nullable N] = null # Used to store items
+       var _capacity: Int = 0 # Size of _array
+       redef readable var _length: Int = 0 # Number of items in the map

 
 

-       readable attr _first_item: nullable N = null # First added item (used to visit items in nice order)
-       attr _last_item: nullable N = null # Last added item (same)
+       readable 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)

 
        # The last index accessed
 
        # The last index accessed

-       attr _last_accessed_index: Int = -1
+       var _last_accessed_index: Int = -1

 
        # The last key accessed
 
        # The last key accessed

-       attr _last_accessed_key: nullable K = null
+       var _last_accessed_key: nullable K = null

 
        # Return the index of the k element
 
        # Return the index of the k element

-       meth index_at(k: K): Int
+       fun index_at(k: K): Int

        do
                var arr = _array
 
        do
                var arr = _array
 

@@ -106,7 +106,7 @@ special ArrayCapable[nullable N]
        end
 
        # Add a new node (should be free)
        end
 
        # Add a new node (should be free)

-       meth store(index: Int, node: N)
+       fun store(index: Int, node: N)

        do
                # Store the item in the list
                if _first_item == null then
        do
                # Store the item in the list
                if _first_item == null then

@@ -128,7 +128,7 @@ special ArrayCapable[nullable N]
                end
        end
 
                end
        end
 

-       meth remove_index(i: Int)
+       fun remove_index(i: Int)

        do
                assert correct_index: i >= 0 and i < _capacity
                var node = _array[i]
        do
                assert correct_index: i >= 0 and i < _capacity
                var node = _array[i]

@@ -168,7 +168,7 @@ special ArrayCapable[nullable N]
                end
        end
 
                end
        end
 

-       meth raz
+       fun raz

        do
                var i = _capacity - 1
                while i >= 0 do
        do
                var i = _capacity - 1
                while i >= 0 do

@@ -181,7 +181,7 @@ special ArrayCapable[nullable N]
                _last_accessed_key = null
        end
 
                _last_accessed_key = null
        end
 

-       meth enlarge(cap: Int)
+       fun enlarge(cap: Int)

        do
                var old_cap = _capacity
                # get a new capacity
        do
                var old_cap = _capacity
                # get a new capacity

@@ -218,27 +218,27 @@ special ArrayCapable[nullable N]
 end
 
 private class HashNode[K]
 end
 
 private class HashNode[K]

-       meth key: K is abstract
+       fun key: K is abstract

        type N: HashNode[K]
        type N: HashNode[K]

-       readable writable attr _next_item: nullable N = null
-       readable writable attr _prev_item: nullable N = null
+       readable writable var _next_item: nullable N = null
+       readable writable var _prev_item: nullable N = null

 end
 
 class HashMap[K, V]
 special CoupleMap[K, V]
 special HashCollection[K, HashMapNode[K, V], V]
 
 end
 
 class HashMap[K, V]
 special CoupleMap[K, V]
 special HashCollection[K, HashMapNode[K, V], V]
 

-       redef meth iterator: HashMapIterator[K, V] do return new HashMapIterator[K,V](self)
+       redef fun iterator: HashMapIterator[K, V] do return new HashMapIterator[K,V](self)

 
 

-       redef meth first
+       redef fun first

        do
                assert _length > 0
                return _first_item.second
        end
 
        do
                assert _length > 0
                return _first_item.second
        end
 

-       redef meth is_empty do return _length == 0
+       redef fun is_empty do return _length == 0

 
 

-       redef meth count(item)
+       redef fun count(item)

        do
                var nb = 0
                var i = 0
        do
                var nb = 0
                var i = 0

@@ -250,7 +250,7 @@ special HashCollection[K, HashMapNode[K, V], V]
                return nb
        end
 
                return nb
        end
 

-       redef meth has(item)
+       redef fun has(item)

        do
                var i = 0
                while i < _capacity do
        do
                var i = 0
                while i < _capacity do

@@ -261,7 +261,7 @@ special HashCollection[K, HashMapNode[K, V], V]
                return false
        end
 
                return false
        end
 

-       redef meth has_only(item)
+       redef fun has_only(item)

        do
                var i = 0
                while i < _capacity do
        do
                var i = 0
                while i < _capacity do

@@ -272,7 +272,7 @@ special HashCollection[K, HashMapNode[K, V], V]
                return true
        end
 
                return true
        end
 

-       redef meth []=(key, v)
+       redef fun []=(key, v)

        do
                assert key != null
                var i = index_at(key)
        do
                assert key != null
                var i = index_at(key)

@@ -285,7 +285,7 @@ special HashCollection[K, HashMapNode[K, V], V]
                end
        end
 
                end
        end
 

-       redef meth remove(item)
+       redef fun remove(item)

        do
                var i = 0
                while i < _capacity do
        do
                var i = 0
                while i < _capacity do

@@ -298,11 +298,11 @@ special HashCollection[K, HashMapNode[K, V], V]
                end
        end
 
                end
        end
 

-       redef meth remove_at(key) do remove_index(index_at(key))
+       redef fun remove_at(key) do remove_index(index_at(key))

 
 

-       redef meth clear do raz
+       redef fun clear do raz

 
 

-       redef meth couple_at(key) do return _array[index_at(key)]
+       redef fun couple_at(key) do return _array[index_at(key)]

 
        init
        do
 
        init
        do

@@ -315,7 +315,7 @@ end
 class HashMapNode[K, V]
 special Couple[K, V]
 special HashNode[K]
 class HashMapNode[K, V]
 special Couple[K, V]
 special HashNode[K]

-       redef meth key do return first
+       redef fun key do return first

        redef type N: HashMapNode[K, V]
 
        init(k: K, v: V)
        redef type N: HashMapNode[K, V]
 
        init(k: K, v: V)

@@ -327,37 +327,37 @@ end
 
 class HashMapIterator[K, V]
 special MapIterator[K, V]
 
 class HashMapIterator[K, V]
 special MapIterator[K, V]

-       redef meth is_ok do return _node != null
+       redef fun is_ok do return _node != null

 
 

-       redef meth item
+       redef fun item

        do
                assert is_ok
                return _node.second
        end
 
        do
                assert is_ok
                return _node.second
        end
 

-       #redef meth item=(value)
+       #redef fun item=(value)

        #do
        #       assert is_ok
        #       _node.second = value
        #end
 
        #do
        #       assert is_ok
        #       _node.second = value
        #end
 

-       redef meth key
+       redef fun key

        do
                assert is_ok
                return _node.first
        end
 
        do
                assert is_ok
                return _node.first
        end
 

-       redef meth next
+       redef fun next

        do
                assert is_ok
                _node = _node.next_item
        end
 
        # The map to iterate on
        do
                assert is_ok
                _node = _node.next_item
        end
 
        # The map to iterate on

-       attr _map: HashMap[K, V]
+       var _map: HashMap[K, V]

 
        # The current node
 
        # The current node

-       attr _node: nullable HashMapNode[K, V]
+       var _node: nullable HashMapNode[K, V]

 
        init(map: HashMap[K, V])
        do
 
        init(map: HashMap[K, V])
        do

@@ -370,20 +370,20 @@ class HashSet[E]
 special Set[E]
 special HashCollection[E, HashSetNode[E], E]
 
 special Set[E]
 special HashCollection[E, HashSetNode[E], E]
 

-       redef meth is_empty do return _length == 0
+       redef fun is_empty do return _length == 0

 
 

-       redef meth first
+       redef fun first

        do
                assert _length > 0
                return _first_item.key
        end
 
        do
                assert _length > 0
                return _first_item.key
        end
 

-       redef meth has(item)
+       redef fun has(item)

        do
                return _array[index_at(item)] != null
        end
 
        do
                return _array[index_at(item)] != null
        end
 

-       redef meth add(item)
+       redef fun add(item)

        do
                var i = index_at(item)
                var c = _array[i]
        do
                var i = index_at(item)
                var c = _array[i]

@@ -394,11 +394,11 @@ special HashCollection[E, HashSetNode[E], E]
                end
        end
 
                end
        end
 

-       redef meth remove(item) do remove_index(index_at(item))
+       redef fun remove(item) do remove_index(index_at(item))

 
 

-       redef meth clear do raz
+       redef fun clear do raz

 
 

-       redef meth iterator do return new HashSetIterator[E](self)
+       redef fun iterator do return new HashSetIterator[E](self)

 
        init
        do
 
        init
        do

@@ -412,7 +412,7 @@ class HashSetNode[E]
 special HashNode[E]
        redef type N: HashSetNode[E]
 
 special HashNode[E]
        redef type N: HashSetNode[E]
 

-       redef readable writable attr _key: E
+       redef readable writable var _key: E

 
        init(e: E)
        do
 
        init(e: E)
        do

@@ -422,25 +422,25 @@ end
 
 class HashSetIterator[E]
 special Iterator[E]
 
 class HashSetIterator[E]
 special Iterator[E]

-       redef meth is_ok do return _node != null
+       redef fun is_ok do return _node != null

 
 

-       redef meth item
+       redef fun item

        do
                assert is_ok
                return _node.key
        end
 
        do
                assert is_ok
                return _node.key
        end
 

-       redef meth next
+       redef fun next

        do
                assert is_ok
                _node = _node.next_item
        end
 
        # The set to iterate on
        do
                assert is_ok
                _node = _node.next_item
        end
 
        # The set to iterate on

-       attr _set: HashSet[E]
+       var _set: HashSet[E]

 
        # The position in the internal map storage
 
        # The position in the internal map storage

-       attr _node: nullable HashSetNode[E]
+       var _node: nullable HashSetNode[E]

 
        init(set: HashSet[E])
        do
 
        init(set: HashSet[E])
        do

diff --git a/lib/standard/kernel.nit b/lib/standard/kernel.nit
index 80a1282..64de7c3 100644 (file)
--- a/lib/standard/kernel.nit
+++ b/lib/standard/kernel.nit
@@ -24,37 +24,37 @@ import end # Mark this module is a top level one. (must be only one)
 # Each class implicitely specialize Object.
 interface Object
        # The unique object identifier in the class
 # Each class implicitely specialize Object.
 interface Object
        # The unique object identifier in the class

-       meth object_id: Int is intern
+       fun object_id: Int is intern

 
        # Return true is `self' and `other' have the same dynamic type
 
        # Return true is `self' and `other' have the same dynamic type

-       meth is_same_type(other: Object): Bool is intern
+       fun is_same_type(other: Object): Bool is intern

 
        # Have `self' and `other' the same value?
        ##
        # Implicitely, the default implementation, is ==
 
        # Have `self' and `other' the same value?
        ##
        # Implicitely, the default implementation, is ==

-       meth ==(other: nullable Object): Bool do return self is other
+       fun ==(other: nullable Object): Bool do return self is other

 
        # Have `self' and `other' different values?
        ##
        # != is equivament with "not =".
 
        # Have `self' and `other' different values?
        ##
        # != is equivament with "not =".

-       meth !=(other: nullable Object): Bool do return not (self == other)
+       fun !=(other: nullable Object): Bool do return not (self == other)

 
        # Display self on stdout (debug only).
 
        # Display self on stdout (debug only).

-       meth output
+       fun output

        do
                '<'.output
                object_id.output
                '>'.output
        end
 
        do
                '<'.output
                object_id.output
                '>'.output
        end
 

-       protected meth exit(exit_value: Int) is intern # Quit the program.
-       protected meth sys: Sys is intern # The global sys object
+       protected fun exit(exit_value: Int) is intern # Quit the program.
+       protected fun sys: Sys is intern # The global sys object

 end
 
 # The main class of the program.
 class Sys
        # Instructions outside classes implicetely redefine this method.
 end
 
 # The main class of the program.
 class Sys
        # Instructions outside classes implicetely redefine this method.

-       meth main do end
+       fun main do end

 end
 
 ###############################################################################
 end
 
 ###############################################################################

@@ -67,19 +67,19 @@ interface Comparable
        type OTHER: Comparable
 
        # Is `self' lesser than `other'
        type OTHER: Comparable
 
        # Is `self' lesser than `other'

-       meth <(other: OTHER): Bool is abstract 
+       fun <(other: OTHER): Bool is abstract 

 
        # not `other' < `self'
 
        # not `other' < `self'

-       meth <=(other: OTHER): Bool do return not other < self
+       fun <=(other: OTHER): Bool do return not other < self

 
        # not `self' < `other' 
 
        # not `self' < `other' 

-       meth >=(other: OTHER): Bool do return not self < other
+       fun >=(other: OTHER): Bool do return not self < other

 
        # `other' < `self'
 
        # `other' < `self'

-       meth >(other: OTHER): Bool do return other < self
+       fun >(other: OTHER): Bool do return other < self

 
        # -1 if <, +1 if > and 0 otherwise
 
        # -1 if <, +1 if > and 0 otherwise

-       meth <=>(other: OTHER): Int
+       fun <=>(other: OTHER): Int

        do
                if self < other then
                        return -1
        do
                if self < other then
                        return -1

@@ -91,13 +91,13 @@ interface Comparable
        end
 
        # c <= self <= d
        end
 
        # c <= self <= d

-       meth is_between(c: OTHER, d: OTHER): Bool
+       fun is_between(c: OTHER, d: OTHER): Bool

        do
                return c <= self and self <= d
        end
 
        # The maximum between `self' and `other' (prefers `self' if equals).
        do
                return c <= self and self <= d
        end
 
        # The maximum between `self' and `other' (prefers `self' if equals).

-       meth max(other: OTHER): OTHER
+       fun max(other: OTHER): OTHER

        do
                if self < other then
                        return other
        do
                if self < other then
                        return other

@@ -107,7 +107,7 @@ interface Comparable
        end
 
        # The minimum between `self' and `c' (prefer `self' if equals)
        end
 
        # The minimum between `self' and `c' (prefer `self' if equals)

-       meth min(c: OTHER): OTHER
+       fun min(c: OTHER): OTHER

        do
                if c < self then
                        return c
        do
                if c < self then
                        return c

@@ -124,21 +124,21 @@ special Comparable
        redef type OTHER: Discrete
 
        # The next element.
        redef type OTHER: Discrete
 
        # The next element.

-       meth succ: OTHER do return self + 1
+       fun succ: OTHER do return self + 1

 
        # The previous element.
 
        # The previous element.

-       meth prec: OTHER do return self - 1
+       fun prec: OTHER do return self - 1

 
        # The `i' th successor element.
 
        # The `i' th successor element.

-       meth +(i: Int): OTHER is abstract
+       fun +(i: Int): OTHER is abstract

 
        # The `i' th previous element.
 
        # The `i' th previous element.

-       meth -(i: Int): OTHER is abstract
+       fun -(i: Int): OTHER is abstract

 
        # The distance between self and d.
        # 10.distance(15)       # --> 5
        # 'Z'.distance('A')     # --> 25
 
        # The distance between self and d.
        # 10.distance(15)       # --> 5
        # 'Z'.distance('A')     # --> 25

-       meth distance(d: OTHER): Int
+       fun distance(d: OTHER): Int

        do
                var cursor: OTHER
                var stop: OTHER
        do
                var cursor: OTHER
                var stop: OTHER

@@ -171,30 +171,30 @@ end
 #       `and', `or', `not'.
 # Booleans are mainly used by conditional statement and loops.
 universal Bool
 #       `and', `or', `not'.
 # Booleans are mainly used by conditional statement and loops.
 universal Bool

-       redef meth object_id is intern
-       redef meth ==(b) is intern
-       redef meth !=(b) is intern
-       redef meth output is intern
+       redef fun object_id is intern
+       redef fun ==(b) is intern
+       redef fun !=(b) is intern
+       redef fun output is intern

 end
 
 # Native floating point numbers.
 # Corresponds to C float.
 universal Float
 end
 
 # Native floating point numbers.
 # Corresponds to C float.
 universal Float

-       redef meth object_id is intern
-       redef meth output is intern
-
-       meth <=(i: Float): Bool is intern
-       meth <(i: Float): Bool is intern
-       meth >=(i: Float): Bool is intern
-       meth >(i: Float): Bool is intern
-       meth +(i: Float): Float is intern
-       meth -: Float is intern
-       meth -(i: Float): Float is intern
-       meth *(i: Float): Float is intern
-       meth /(i: Float): Float is intern
+       redef fun object_id is intern
+       redef fun output is intern
+
+       fun <=(i: Float): Bool is intern
+       fun <(i: Float): Bool is intern
+       fun >=(i: Float): Bool is intern
+       fun >(i: Float): Bool is intern
+       fun +(i: Float): Float is intern
+       fun -: Float is intern
+       fun -(i: Float): Float is intern
+       fun *(i: Float): Float is intern
+       fun /(i: Float): Float is intern

        
        # The integer part of `self'.
        
        # The integer part of `self'.

-       meth to_i: Int is intern
+       fun to_i: Int is intern

 end
 
 # Native integer numbers.
 end
 
 # Native integer numbers.

@@ -203,30 +203,30 @@ universal Int
 special Discrete
        redef type OTHER: Int
 
 special Discrete
        redef type OTHER: Int
 

-       redef meth object_id is intern
-       redef meth ==(i) is intern
-       redef meth !=(i) is intern
-       redef meth output is intern
-
-       redef meth <=(i) is intern
-       redef meth <(i) is intern
-       redef meth >=(i) is intern
-       redef meth >(i) is intern
-       redef meth +(i) is intern
-       meth -: Int is intern
-       redef meth -(i) is intern
-       meth *(i: Int): Int is intern
-       meth /(i: Int): Int is intern
-       meth %(i: Int): Int is intern   
-       meth lshift(i: Int): Int is intern
-       meth rshift(i: Int): Int is intern   
+       redef fun object_id is intern
+       redef fun ==(i) is intern
+       redef fun !=(i) is intern
+       redef fun output is intern
+
+       redef fun <=(i) is intern
+       redef fun <(i) is intern
+       redef fun >=(i) is intern
+       redef fun >(i) is intern
+       redef fun +(i) is intern
+       fun -: Int is intern
+       redef fun -(i) is intern
+       fun *(i: Int): Int is intern
+       fun /(i: Int): Int is intern
+       fun %(i: Int): Int is intern   
+       fun lshift(i: Int): Int is intern
+       fun rshift(i: Int): Int is intern   

 
        # The float equivalent of `self'
 
        # The float equivalent of `self'

-       meth to_f: Float is intern
+       fun to_f: Float is intern

 
 

-       redef meth succ is intern
-       redef meth prec is intern
-       redef meth distance(i)
+       redef fun succ is intern
+       redef fun prec is intern
+       redef fun distance(i)

        do
                var d = self - i
                if d >= 0 then
        do
                var d = self - i
                if d >= 0 then

@@ -236,7 +236,7 @@ special Discrete
                end
        end
        
                end
        end
        

-       redef meth <=>(other)
+       redef fun <=>(other)

        do
                if self < other then
                        return -1
        do
                if self < other then
                        return -1

@@ -247,7 +247,7 @@ special Discrete
                end
        end
 
                end
        end
 

-       redef meth is_between(c, d)
+       redef fun is_between(c, d)

        do
                if self < c or d < self then 
                        return false
        do
                if self < c or d < self then 
                        return false

@@ -256,7 +256,7 @@ special Discrete
                end
        end
 
                end
        end
 

-       redef meth max(other)
+       redef fun max(other)

        do
                if self < other then
                        return other
        do
                if self < other then
                        return other

@@ -265,7 +265,7 @@ special Discrete
                end
        end
 
                end
        end
 

-       redef meth min(c)
+       redef fun min(c)

        do
                if c < self then
                        return c
        do
                if c < self then
                        return c

@@ -275,10 +275,10 @@ special Discrete
        end
 
        # The character whose ASCII value is `self'.
        end
 
        # The character whose ASCII value is `self'.

-       meth ascii: Char is intern
+       fun ascii: Char is intern

 
        # Number of digits of an integer in base `b' plus one if negative)
 
        # Number of digits of an integer in base `b' plus one if negative)

-       meth digit_count(b: Int): Int
+       fun digit_count(b: Int): Int

        do
                var d: Int # number of digits
                var n: Int # current number
        do
                var d: Int # number of digits
                var n: Int # current number

@@ -303,7 +303,7 @@ special Discrete
        # Return the corresponding digit character
        # If 0 <= `self' <= 9, return the corresponding character.
        # If 10 <= `self' <= 36, return the corresponding letter [a..z].
        # Return the corresponding digit character
        # If 0 <= `self' <= 9, return the corresponding character.
        # If 10 <= `self' <= 36, return the corresponding letter [a..z].

-       meth to_c: Char
+       fun to_c: Char

        do
                assert self >= 0 and self <= 36 # TODO plan for this
                if self < 10 then
        do
                assert self >= 0 and self <= 36 # TODO plan for this
                if self < 10 then

@@ -321,20 +321,20 @@ universal Char
 special Discrete
        redef type OTHER: Char
 
 special Discrete
        redef type OTHER: Char
 

-       redef meth object_id is intern
-       redef meth ==(o) is intern
-       redef meth !=(o) is intern
-       redef meth output is intern
+       redef fun object_id is intern
+       redef fun ==(o) is intern
+       redef fun !=(o) is intern
+       redef fun output is intern

 
 

-       redef meth <=(i) is intern
-       redef meth <(i) is intern
-       redef meth >=(i) is intern
-       redef meth >(i) is intern
+       redef fun <=(i) is intern
+       redef fun <(i) is intern
+       redef fun >=(i) is intern
+       redef fun >(i) is intern

 
 

-       redef meth succ is intern
-       redef meth prec is intern
+       redef fun succ is intern
+       redef fun prec is intern

 
 

-       redef meth distance(c)
+       redef fun distance(c)

        do
                var d = self.ascii - c.ascii
                if d >= 0 then
        do
                var d = self.ascii - c.ascii
                if d >= 0 then

@@ -345,7 +345,7 @@ special Discrete
        end
 
        # If `self' is a digit then return this digit.
        end
 
        # If `self' is a digit then return this digit.

-       meth to_i: Int
+       fun to_i: Int

        do
 
                if self == '-' then
        do
 
                if self == '-' then

@@ -358,13 +358,13 @@ special Discrete
        end
 
        # the ascii value of self
        end
 
        # the ascii value of self

-       meth ascii: Int is intern
+       fun ascii: Int is intern

 
 

-       redef meth +(i) is intern
-       redef meth -(i) is intern
+       redef fun +(i) is intern
+       redef fun -(i) is intern

 
        # Char to lower case
 
        # Char to lower case

-       meth to_lower : Char
+       fun to_lower : Char

        do
                if self >= 'A' and self <= 'Z' then
                        return (ascii + ('a'.distance('A'))).ascii
        do
                if self >= 'A' and self <= 'Z' then
                        return (ascii + ('a'.distance('A'))).ascii

@@ -374,7 +374,7 @@ special Discrete
        end
 
        # Char to upper case
        end
 
        # Char to upper case

-       meth to_upper : Char
+       fun to_upper : Char

        do
                if self >= 'a' and self <= 'z' then
                        return (ascii - ('a'.distance('A'))).ascii
        do
                if self >= 'a' and self <= 'z' then
                        return (ascii - ('a'.distance('A'))).ascii

diff --git a/lib/standard/list.nit b/lib/standard/list.nit
index 6a0fd19..13a8e29 100644 (file)
--- a/lib/standard/list.nit
+++ b/lib/standard/list.nit
@@ -19,29 +19,29 @@ import abstract_collection
 class List[E]
 special IndexedCollection[E]
 # Access
 class List[E]
 special IndexedCollection[E]
 # Access

-       redef meth [](index) do return get_node(index).item
+       redef fun [](index) do return get_node(index).item

 
 

-       redef meth []=(index, item) do get_node(index).item = item
+       redef fun []=(index, item) do get_node(index).item = item

 
        # O(1)
 
        # O(1)

-       redef meth first do return _head.item
+       redef fun first do return _head.item

 
        # O(1)
 
        # O(1)

-       redef meth first=(e) do _head.item = e
+       redef fun first=(e) do _head.item = e

 
        # O(1)
 
        # O(1)

-       redef meth last do return _tail.item
+       redef fun last do return _tail.item

 
        # O(1)
 
        # O(1)

-       redef meth last=(e) do _tail.item = e
+       redef fun last=(e) do _tail.item = e

 
 # Queries
 
        # O(1)
 
 # Queries
 
        # O(1)

-       redef meth is_empty do return _head == null
+       redef fun is_empty do return _head == null

 
        # O(n)
 
        # O(n)

-       redef meth length
+       redef fun length

        do
                var l = 0
                var t = _head
        do
                var l = 0
                var t = _head

@@ -53,9 +53,9 @@ special IndexedCollection[E]
        end
 
        # O(n)
        end
 
        # O(n)

-       redef meth has(e) do return search_node_after(e, _head) != null
+       redef fun has(e) do return search_node_after(e, _head) != null

 
 

-       redef meth has_only(e)
+       redef fun has_only(e)

        do
                var node = _head
                while node != null do
        do
                var node = _head
                while node != null do

@@ -65,7 +65,7 @@ special IndexedCollection[E]
                return true
        end
 
                return true
        end
 

-       redef meth count(e)
+       redef fun count(e)

        do
                var nb = 0
                var node = _head
        do
                var nb = 0
                var node = _head

@@ -76,12 +76,12 @@ special IndexedCollection[E]
                return nb
        end
 
                return nb
        end
 

-       redef meth has_key(index) do return get_node(index) != null
+       redef fun has_key(index) do return get_node(index) != null

 
 # Add elements
 
        # O(1)
 
 # Add elements
 
        # O(1)

-       redef meth push(e)
+       redef fun push(e)

        do
                var node = new ListNode[E](e)
                if _tail == null then
        do
                var node = new ListNode[E](e)
                if _tail == null then

@@ -94,7 +94,7 @@ special IndexedCollection[E]
        end
 
        # O(1)
        end
 
        # O(1)

-       redef meth unshift(e)
+       redef fun unshift(e)

        do
                var node = new ListNode[E](e)
                if _head == null then
        do
                var node = new ListNode[E](e)
                if _head == null then

@@ -109,7 +109,7 @@ special IndexedCollection[E]
        # Append `l' to `self' but clear `l'.
        ##
        # O(1)
        # Append `l' to `self' but clear `l'.
        ##
        # O(1)

-       meth link(l: List[E])
+       fun link(l: List[E])

        do
                if _tail == null then
                        _head = l._head
        do
                if _tail == null then
                        _head = l._head

@@ -124,7 +124,7 @@ special IndexedCollection[E]
 # Remove elements
 
        # O(1)
 # Remove elements
 
        # O(1)

-       redef meth pop
+       redef fun pop

        do
                var node = _tail
                _tail = node.prev
        do
                var node = _tail
                _tail = node.prev

@@ -138,7 +138,7 @@ special IndexedCollection[E]
        end
 
        # O(1)
        end
 
        # O(1)

-       redef meth shift
+       redef fun shift

        do
                var node = _head
                _head = node.next
        do
                var node = _head
                _head = node.next

@@ -151,26 +151,26 @@ special IndexedCollection[E]
                return node.item
        end
 
                return node.item
        end
 

-       redef meth remove(e)
+       redef fun remove(e)

        do
                var node = search_node_after(e, _head)
                if node != null then remove_node(node)
        end
 
        do
                var node = search_node_after(e, _head)
                if node != null then remove_node(node)
        end
 

-       redef meth remove_at(i)
+       redef fun remove_at(i)

        do
                var node = get_node(i)
                if node != null then remove_node(node)
        end
 
        do
                var node = get_node(i)
                if node != null then remove_node(node)
        end
 

-       redef meth clear
+       redef fun clear

        do
                _head = null
                _tail = null
        end
 
 
        do
                _head = null
                _tail = null
        end
 
 

-       redef meth iterator: ListIterator[E] do return new ListIterator[E](_head)
+       redef fun iterator: ListIterator[E] do return new ListIterator[E](_head)

 
        # Build an empty list.
        init do end
 
        # Build an empty list.
        init do end

@@ -179,13 +179,13 @@ special IndexedCollection[E]
        init from(coll: Collection[E]) do append(coll)
 
        # The first node of the list
        init from(coll: Collection[E]) do append(coll)
 
        # The first node of the list

-       attr _head: nullable ListNode[E]
+       var _head: nullable ListNode[E]

 
        # The last node of the list
 
        # The last node of the list

-       attr _tail: nullable ListNode[E]
+       var _tail: nullable ListNode[E]

 
        # Get the `i'th node. get `null' otherwise.
 
        # Get the `i'th node. get `null' otherwise.

-       private meth get_node(i: Int): nullable ListNode[E]
+       private fun get_node(i: Int): nullable ListNode[E]

        do
                var n = _head
                if i < 0 then
        do
                var n = _head
                if i < 0 then

@@ -199,7 +199,7 @@ special IndexedCollection[E]
        end
 
        # get the first node that contains e after 'after', null otherwise
        end
 
        # get the first node that contains e after 'after', null otherwise

-       private meth search_node_after(e: E, after: nullable ListNode[E]): nullable ListNode[E]
+       private fun search_node_after(e: E, after: nullable ListNode[E]): nullable ListNode[E]

        do
                var n = after
                while n != null and n.item != e do n = n.next
        do
                var n = after
                while n != null and n.item != e do n = n.next

@@ -207,7 +207,7 @@ special IndexedCollection[E]
        end
 
        # Remove the node (ie. atach prev and next)
        end
 
        # Remove the node (ie. atach prev and next)

-       private meth remove_node(node: ListNode[E])
+       private fun remove_node(node: ListNode[E])

        do
                if node.prev == null then
                        _head = node.next
        do
                if node.prev == null then
                        _head = node.next

@@ -225,7 +225,7 @@ special IndexedCollection[E]
                end
        end
 
                end
        end
 

-       private meth insert_before(element: E, node: ListNode[E])
+       private fun insert_before(element: E, node: ListNode[E])

        do
                var nnode = new ListNode[E](element)
                var prev = node.prev
        do
                var nnode = new ListNode[E](element)
                var prev = node.prev

@@ -243,13 +243,13 @@ end
 # This is the iterator class of List
 class ListIterator[E]
 special IndexedIterator[E]
 # This is the iterator class of List
 class ListIterator[E]
 special IndexedIterator[E]

-       redef meth item do return _node.item
+       redef fun item do return _node.item

 
 

-       # redef meth item=(e) do _node.item = e
+       # redef fun item=(e) do _node.item = e

 
 

-       redef meth is_ok do return not _node == null
+       redef fun is_ok do return not _node == null

 
 

-       redef meth next
+       redef fun next

        do
                _node = _node.next
                _index += 1
        do
                _node = _node.next
                _index += 1

@@ -263,10 +263,10 @@ special IndexedIterator[E]
        end
 
        # The current node of the list
        end
 
        # The current node of the list

-       attr _node: nullable ListNode[E]
+       var _node: nullable ListNode[E]

 
        # The index of the current node
 
        # The index of the current node

-       redef readable attr _index: Int
+       redef readable var _index: Int

 end
 
 # Linked nodes that constitute a linked list.
 end
 
 # Linked nodes that constitute a linked list.

@@ -278,8 +278,8 @@ special Container[E]
        end
 
        # The next node.
        end
 
        # The next node.

-       readable writable attr _next: nullable ListNode[E]
+       readable writable var _next: nullable ListNode[E]

 
        # The previous node.
 
        # The previous node.

-       readable writable attr _prev: nullable ListNode[E]
+       readable writable var _prev: nullable ListNode[E]

 end
 end

diff --git a/lib/standard/math.nit b/lib/standard/math.nit
index 470c561..1daaedc 100644 (file)
--- a/lib/standard/math.nit
+++ b/lib/standard/math.nit
@@ -16,26 +16,26 @@ package math
 import kernel
 
 redef class Int
 import kernel
 
 redef class Int

-       meth rand: Int is extern "kernel_Int_Int_rand_0"
+       fun rand: Int is extern "kernel_Int_Int_rand_0"

 end
 
 redef class Float
 end
 
 redef class Float

-       meth sqrt: Float is extern "kernel_Float_Float_sqrt_0"
-       meth cos: Float is extern "kernel_Float_Float_cos_0"
-       meth sin: Float is extern "kernel_Float_Float_sin_0"
-       meth tan: Float is extern "kernel_Float_Float_tan_0"
-       meth acos: Float is extern "kernel_Float_Float_acos_0"
-       meth asin: Float is extern "kernel_Float_Float_asin_0"
-       meth atan: Float is extern "kernel_Float_Float_atan_0"
+       fun sqrt: Float is extern "kernel_Float_Float_sqrt_0"
+       fun cos: Float is extern "kernel_Float_Float_cos_0"
+       fun sin: Float is extern "kernel_Float_Float_sin_0"
+       fun tan: Float is extern "kernel_Float_Float_tan_0"
+       fun acos: Float is extern "kernel_Float_Float_acos_0"
+       fun asin: Float is extern "kernel_Float_Float_asin_0"
+       fun atan: Float is extern "kernel_Float_Float_atan_0"

 
 

-       meth pow(e: Float): Float is extern "kernel_Float_Float_pow_1"
-       meth log: Float is extern "kernel_Float_Float_log_0"
-       meth exp: Float is extern "kernel_Float_Float_exp_0"
+       fun pow(e: Float): Float is extern "kernel_Float_Float_pow_1"
+       fun log: Float is extern "kernel_Float_Float_log_0"
+       fun exp: Float is extern "kernel_Float_Float_exp_0"

        
        

-       meth rand: Float is extern "kernel_Float_Float_rand_0"
+       fun rand: Float is extern "kernel_Float_Float_rand_0"

 end
 
 end
 

-meth atan2(x: Float, y: Float): Float is extern "kernel_Any_Any_atan2_2"
-meth pi: Float is extern "kernel_Any_Any_pi_0"
-meth srand_from(x: Int) is extern "kernel_Any_Any_srand_from_1"
-meth srand is extern "kernel_Any_Any_srand_0"
+fun atan2(x: Float, y: Float): Float is extern "kernel_Any_Any_atan2_2"
+fun pi: Float is extern "kernel_Any_Any_pi_0"
+fun srand_from(x: Int) is extern "kernel_Any_Any_srand_from_1"
+fun srand is extern "kernel_Any_Any_srand_0"

diff --git a/lib/standard/range.nit b/lib/standard/range.nit
index bf6d6a2..0641c2b 100644 (file)
--- a/lib/standard/range.nit
+++ b/lib/standard/range.nit
@@ -19,19 +19,19 @@ import abstract_collection
 class Range[E: Discrete]
 special Collection[E]
 
 class Range[E: Discrete]
 special Collection[E]
 

-       redef readable attr _first: E
+       redef readable var _first: E

 
        # Get the last element.
 
        # Get the last element.

-       readable attr _last: E
+       readable var _last: E

 
        # Get the element after the last one.
 
        # Get the element after the last one.

-       readable attr _after: E
+       readable var _after: E

 
 

-       redef meth has(item) do return item >= _first and item <= _last
+       redef fun has(item) do return item >= _first and item <= _last

 
 

-       redef meth has_only(item) do return _first == item and item == _last
+       redef fun has_only(item) do return _first == item and item == _last

 
 

-       redef meth count(item)
+       redef fun count(item)

        do
                if has(item) then
                        return 1
        do
                if has(item) then
                        return 1

@@ -40,9 +40,9 @@ special Collection[E]
                end
        end
 
                end
        end
 

-       redef meth iterator do return new IteratorRange[E](self)
+       redef fun iterator do return new IteratorRange[E](self)

 
 

-       redef meth length
+       redef fun length

        do
                var nb = _first.distance(_after)
                if nb > 0 then
        do
                var nb = _first.distance(_after)
                if nb > 0 then

@@ -52,7 +52,7 @@ special Collection[E]
                end
        end
 
                end
        end
 

-       redef meth is_empty do return _first >= _after
+       redef fun is_empty do return _first >= _after

 
        # Create a range [`from', `to'].
        # The syntax [`from'..`to'[ is equivalent.
 
        # Create a range [`from', `to'].
        # The syntax [`from'..`to'[ is equivalent.

@@ -76,12 +76,12 @@ end
 class IteratorRange[E: Discrete]
        # Iterator on ranges.
 special Iterator[E]
 class IteratorRange[E: Discrete]
        # Iterator on ranges.
 special Iterator[E]

-       attr _range: Range[E]   
-       redef readable attr _item: E
+       var _range: Range[E]    
+       redef readable var _item: E

 
 

-       redef meth is_ok do return _item < _range.after
+       redef fun is_ok do return _item < _range.after

        
        

-       redef meth next do _item = _item.succ
+       redef fun next do _item = _item.succ

        
        init(r: Range[E])
        do
        
        init(r: Range[E])
        do

diff --git a/lib/standard/sorter.nit b/lib/standard/sorter.nit
index d24a02a..8240a0c 100644 (file)
--- a/lib/standard/sorter.nit
+++ b/lib/standard/sorter.nit
@@ -24,13 +24,13 @@ class AbstractSorter[E: Object]
        #       -1 if a < b
        #       0  if a = b
        #       1  if a > b
        #       -1 if a < b
        #       0  if a = b
        #       1  if a > b

-       protected meth compare(a: E, b: E): Int is abstract
+       protected fun compare(a: E, b: E): Int is abstract

 
        # Sort `array' using the `compare' function.
 
        # Sort `array' using the `compare' function.

-       meth sort(array: Array[E]) do sub_sort(array, 0, array.length-1)
+       fun sort(array: Array[E]) do sub_sort(array, 0, array.length-1)

 
        # Sort `array' between `from' and `to' indices
 
        # Sort `array' between `from' and `to' indices

-       private meth sub_sort(array: Array[E], from: Int, to: Int)
+       private fun sub_sort(array: Array[E], from: Int, to: Int)

        do
                if from >= to then
                        return
        do
                if from >= to then
                        return

@@ -42,7 +42,7 @@ class AbstractSorter[E: Object]
        end
 
        # Quick-sort `array' between `from' and `to' indices
        end
 
        # Quick-sort `array' between `from' and `to' indices

-       private meth quick_sort(array: Array[E], from: Int, to: Int)
+       private fun quick_sort(array: Array[E], from: Int, to: Int)

        do
                var pivot = array[from]
                var i = from
        do
                var pivot = array[from]
                var i = from

@@ -63,7 +63,7 @@ class AbstractSorter[E: Object]
        end
        
        # Bubble-sort `array' between `from' and `to' indices
        end
        
        # Bubble-sort `array' between `from' and `to' indices

-       private meth bubble_sort(array: Array[E], from: Int, to: Int)
+       private fun bubble_sort(array: Array[E], from: Int, to: Int)

        do
                var i = from
                while i < to do
        do
                var i = from
                while i < to do

@@ -91,7 +91,7 @@ end
 class ComparableSorter[E: Comparable]
 special AbstractSorter[E]
        # Return a <=> b
 class ComparableSorter[E: Comparable]
 special AbstractSorter[E]
        # Return a <=> b

-       redef meth compare(a, b) do return a <=> b
+       redef fun compare(a, b) do return a <=> b

 
        init do end
 end
 
        init do end
 end

diff --git a/lib/standard/stream.nit b/lib/standard/stream.nit
index 45c9f32..0d59246 100644 (file)
--- a/lib/standard/stream.nit
+++ b/lib/standard/stream.nit
@@ -18,17 +18,17 @@ import string
 # Abstract stream class
 class IOS
        # close the stream
 # Abstract stream class
 class IOS
        # close the stream

-       meth close is abstract
+       fun close is abstract

 end
 
 # Abstract input streams
 class IStream
 special IOS
        # Read a character. Return its ASCII value, -1 on EOF or timeout
 end
 
 # Abstract input streams
 class IStream
 special IOS
        # Read a character. Return its ASCII value, -1 on EOF or timeout

-       meth read_char: Int is abstract
+       fun read_char: Int is abstract

 
        # Read at most i bytes
 
        # Read at most i bytes

-       meth read(i: Int): String
+       fun read(i: Int): String

        do
                var s = new Buffer.with_capacity(i)
                while i > 0 and not eof do
        do
                var s = new Buffer.with_capacity(i)
                while i > 0 and not eof do

@@ -42,7 +42,7 @@ special IOS
        end
 
        # Read a string until the end of the line.
        end
 
        # Read a string until the end of the line.

-       meth read_line: String
+       fun read_line: String

        do
                assert not eof
                var s = new Buffer
        do
                assert not eof
                var s = new Buffer

@@ -51,7 +51,7 @@ special IOS
        end
 
        # Read all the stream until the eof.
        end
 
        # Read all the stream until the eof.

-       meth read_all: String
+       fun read_all: String

        do
                var s = new Buffer
                while not eof do
        do
                var s = new Buffer
                while not eof do

@@ -62,7 +62,7 @@ special IOS
        end
 
        # Read a string until the end of the line and append it to `s'.
        end
 
        # Read a string until the end of the line and append it to `s'.

-       meth append_line_to(s: Buffer)
+       fun append_line_to(s: Buffer)

        do
                while true do
                        var x = read_char
        do
                while true do
                        var x = read_char

@@ -77,23 +77,23 @@ special IOS
        end
 
        # Is there something to read.
        end
 
        # Is there something to read.

-       meth eof: Bool is abstract
+       fun eof: Bool is abstract

 end
 
 # Abstract output stream
 class OStream
 special IOS
        # write a string
 end
 
 # Abstract output stream
 class OStream
 special IOS
        # write a string

-       meth write(s: String) is abstract
+       fun write(s: String) is abstract

 
        # Can the stream be used to write
 
        # Can the stream be used to write

-       meth is_writable: Bool is abstract
+       fun is_writable: Bool is abstract

 end
 
 # Input streams with a buffer
 class BufferedIStream
 special IStream
 end
 
 # Input streams with a buffer
 class BufferedIStream
 special IStream

-       redef meth read_char
+       redef fun read_char

        do
                assert not eof
                if _buffer_pos >= _buffer.length then
        do
                assert not eof
                if _buffer_pos >= _buffer.length then

@@ -107,7 +107,7 @@ special IStream
                return c.ascii
        end
 
                return c.ascii
        end
 

-       redef meth read(i)
+       redef fun read(i)

        do
                var s = new Buffer.with_capacity(i)
                var j = _buffer_pos
        do
                var s = new Buffer.with_capacity(i)
                var j = _buffer_pos

@@ -129,7 +129,7 @@ special IStream
                return s.to_s
        end
 
                return s.to_s
        end
 

-       redef meth read_all
+       redef fun read_all

        do
                var s = new Buffer
                while not eof do
        do
                var s = new Buffer
                while not eof do

@@ -145,7 +145,7 @@ special IStream
                return s.to_s
        end   
 
                return s.to_s
        end   
 

-       redef meth append_line_to(s)
+       redef fun append_line_to(s)

        do
                while true do
                        # First phase: look for a '\n'
        do
                while true do
                        # First phase: look for a '\n'

@@ -181,22 +181,22 @@ special IStream
                end
        end
 
                end
        end
 

-       redef meth eof do return _buffer_pos >= _buffer.length and end_reached
+       redef fun eof do return _buffer_pos >= _buffer.length and end_reached

 
        # The buffer
 
        # The buffer

-       attr _buffer: nullable Buffer = null
+       var _buffer: nullable Buffer = null

 
        # The current position in the buffer
 
        # The current position in the buffer

-       attr _buffer_pos: Int = 0
+       var _buffer_pos: Int = 0

 
        # Fill the buffer
 
        # Fill the buffer

-       protected meth fill_buffer is abstract
+       protected fun fill_buffer is abstract

 
        # Is the last fill_buffer reach the end 
 
        # Is the last fill_buffer reach the end 

-       protected meth end_reached: Bool is abstract
+       protected fun end_reached: Bool is abstract

 
        # Allocate a `_buffer' for a given `capacity'.
 
        # Allocate a `_buffer' for a given `capacity'.

-       protected meth prepare_buffer(capacity: Int)
+       protected fun prepare_buffer(capacity: Int)

        do
                _buffer = new Buffer.with_capacity(capacity)
                _buffer_pos = 0 # need to read
        do
                _buffer = new Buffer.with_capacity(capacity)
                _buffer_pos = 0 # need to read

@@ -213,14 +213,14 @@ end
 class FDStream
 special IOS
        # File description
 class FDStream
 special IOS
        # File description

-       attr _fd: Int
+       var _fd: Int

 
 

-       redef meth close do native_close(_fd)
+       redef fun close do native_close(_fd)

 
 

-       private meth native_close(i: Int): Int is extern "stream_FDStream_FDStream_native_close_1"
-       private meth native_read_char(i: Int): Int is extern "stream_FDStream_FDStream_native_read_char_1"
-       private meth native_read(i: Int, buf: NativeString, len: Int): Int is extern "stream_FDStream_FDStream_native_read_3"
-       private meth native_write(i: Int, buf: NativeString, len: Int): Int is extern "stream_FDStream_FDStream_native_write_3"
+       private fun native_close(i: Int): Int is extern "stream_FDStream_FDStream_native_close_1"
+       private fun native_read_char(i: Int): Int is extern "stream_FDStream_FDStream_native_read_char_1"
+       private fun native_read(i: Int, buf: NativeString, len: Int): Int is extern "stream_FDStream_FDStream_native_read_3"
+       private fun native_write(i: Int, buf: NativeString, len: Int): Int is extern "stream_FDStream_FDStream_native_write_3"

 
        init(fd: Int) do _fd = fd
 end
 
        init(fd: Int) do _fd = fd
 end

@@ -228,9 +228,9 @@ end
 class FDIStream
 special FDStream
 special IStream
 class FDIStream
 special FDStream
 special IStream

-       redef readable attr _eof: Bool = false
+       redef readable var _eof: Bool = false

        
        

-       redef meth read_char
+       redef fun read_char

        do
                var nb = native_read_char(_fd)
                if nb == -1 then _eof = true
        do
                var nb = native_read_char(_fd)
                if nb == -1 then _eof = true

@@ -243,9 +243,9 @@ end
 class FDOStream
 special FDStream
 special OStream
 class FDOStream
 special FDStream
 special OStream

-       redef readable attr _is_writable: Bool
+       redef readable var _is_writable: Bool

 
 

-       redef meth write(s)
+       redef fun write(s)

        do
                var nb = native_write(_fd, s.to_cstring, s.length)
                if nb < s.length then _is_writable = false
        do
                var nb = native_write(_fd, s.to_cstring, s.length)
                if nb < s.length then _is_writable = false

diff --git a/lib/standard/string.nit b/lib/standard/string.nit
index a55e72a..20d0c9e 100644 (file)
--- a/lib/standard/string.nit
+++ b/lib/standard/string.nit
@@ -22,9 +22,9 @@ intrude import array
 
 abstract class AbstractString
 special AbstractArrayRead[Char]
 
 abstract class AbstractString
 special AbstractArrayRead[Char]

-       readable private attr _items: NativeString
+       readable private var _items: NativeString

 
 

-       redef meth [](index) do return _items[index]
+       redef fun [](index) do return _items[index]

 
        # Create a substring.
        #
 
        # Create a substring.
        #

@@ -32,7 +32,7 @@ special AbstractArrayRead[Char]
        # "abcd".substring(-1, 2)       # --> "a"
        # "abcd".substring(1, 0)     # --> ""
        # "abcd".substring(2, 5)     # --> "cd"
        # "abcd".substring(-1, 2)       # --> "a"
        # "abcd".substring(1, 0)     # --> ""
        # "abcd".substring(2, 5)     # --> "cd"

-       meth substring(from: Int, count: Int): String
+       fun substring(from: Int, count: Int): String

        do
                assert count >= 0
                count += from
        do
                assert count >= 0
                count += from

@@ -55,7 +55,7 @@ special AbstractArrayRead[Char]
        # "abcd".substring(1)   # --> "bcd"
        # "abcd".substring(-1)  # --> "abcd"
        # "abcd".substring(2)     # --> "cd"
        # "abcd".substring(1)   # --> "bcd"
        # "abcd".substring(-1)  # --> "abcd"
        # "abcd".substring(2)     # --> "cd"

-       meth substring_from(from: Int): String
+       fun substring_from(from: Int): String

        do
                assert from < length
                return substring(from, length - from)
        do
                assert from < length
                return substring(from, length - from)

@@ -65,7 +65,7 @@ special AbstractArrayRead[Char]
        #
        # "bc".is_substring("abcd",1)   # --> true
        # "bc".is_substring("abcd",2)   # --> false
        #
        # "bc".is_substring("abcd",1)   # --> true
        # "bc".is_substring("abcd",2)   # --> false

-       meth has_substring(str: String, pos: Int): Bool
+       fun has_substring(str: String, pos: Int): Bool

        do
                var itsindex = str.length - 1
                var myindex = pos + itsindex
        do
                var itsindex = str.length - 1
                var myindex = pos + itsindex

@@ -84,26 +84,26 @@ special AbstractArrayRead[Char]
        #
        # "abc".is_prefix("abcd")       # --> true
        # "bc".is_prefix("abcd")        # --> false
        #
        # "abc".is_prefix("abcd")       # --> true
        # "bc".is_prefix("abcd")        # --> false

-       meth has_prefix(prefix: String): Bool do return has_substring(prefix,0)
+       fun has_prefix(prefix: String): Bool do return has_substring(prefix,0)

 
        # Is this string suffixed by 'suffix'
        #
        # "abcd".has_suffix("abc")      # --> false
        # "abcd".has_suffix("bcd")      # --> true
 
        # Is this string suffixed by 'suffix'
        #
        # "abcd".has_suffix("abc")      # --> false
        # "abcd".has_suffix("bcd")      # --> true

-       meth has_suffix(suffix: String): Bool do return has_substring(suffix, length - suffix.length)
+       fun has_suffix(suffix: String): Bool do return has_substring(suffix, length - suffix.length)

 
        # If `self' contains only digits, return the corresponding integer
 
        # If `self' contains only digits, return the corresponding integer

-       meth to_i: Int
+       fun to_i: Int

        do
                # Shortcut
                return to_s.to_cstring.atoi
        end
 
        # If `self' contains only digits and alpha <= 'f', return the corresponding integer.
        do
                # Shortcut
                return to_s.to_cstring.atoi
        end
 
        # If `self' contains only digits and alpha <= 'f', return the corresponding integer.

-       meth to_hex: Int do return a_to(16)
+       fun to_hex: Int do return a_to(16)

 
        # If `self' contains only digits and letters, return the corresponding integer in a given base
 
        # If `self' contains only digits and letters, return the corresponding integer in a given base

-       meth a_to(base: Int) : Int
+       fun a_to(base: Int) : Int

        do
                var i = 0
                var neg = false
        do
                var i = 0
                var neg = false

@@ -131,7 +131,7 @@ special AbstractArrayRead[Char]
        end
 
        # String to upper case
        end
 
        # String to upper case

-       meth to_upper: String
+       fun to_upper: String

        do
                var s = new Buffer.with_capacity(length)
                for i in self do s.add(i.to_upper)
        do
                var s = new Buffer.with_capacity(length)
                for i in self do s.add(i.to_upper)

@@ -139,7 +139,7 @@ special AbstractArrayRead[Char]
        end
 
        # String to lower case
        end
 
        # String to lower case

-       meth to_lower : String
+       fun to_lower : String

        do
                var s = new Buffer.with_capacity(length)
                for i in self do s.add(i.to_lower)
        do
                var s = new Buffer.with_capacity(length)
                for i in self do s.add(i.to_lower)

@@ -147,7 +147,7 @@ special AbstractArrayRead[Char]
        end
 
 
        end
 
 

-       redef meth output
+       redef fun output

        do
                var i = 0
                while i < length do
        do
                var i = 0
                while i < length do

@@ -180,12 +180,12 @@ special AbstractString
        end
 
        # Return a null terminated char *
        end
 
        # Return a null terminated char *

-       meth to_cstring: NativeString
+       fun to_cstring: NativeString

        do
                return _items
        end
 
        do
                return _items
        end
 

-       redef meth ==(o)
+       redef fun ==(o)

        do
                if not o isa String or o is null then return false
                var l = length
        do
                if not o isa String or o is null then return false
                var l = length

@@ -200,7 +200,7 @@ special AbstractString
                return true
        end
 
                return true
        end
 

-       redef meth <(s)
+       redef fun <(s)

        do
                var i = 0
                var l1 = length
        do
                var i = 0
                var l1 = length

@@ -225,7 +225,7 @@ special AbstractString
        end
 
        # The concatenation of `self' with `r'
        end
 
        # The concatenation of `self' with `r'

-       meth +(s: String): String
+       fun +(s: String): String

        do
                var r = new Buffer.with_capacity(length + s.length)
                r.append(self)
        do
                var r = new Buffer.with_capacity(length + s.length)
                r.append(self)

@@ -234,7 +234,7 @@ special AbstractString
        end
 
        # i repetitions of self
        end
 
        # i repetitions of self

-       meth *(i: Int): String
+       fun *(i: Int): String

        do
                assert i >= 0
                var r = new Buffer.with_capacity(length * i)
        do
                assert i >= 0
                var r = new Buffer.with_capacity(length * i)

@@ -245,7 +245,7 @@ special AbstractString
                return r.to_s
        end
 
                return r.to_s
        end
 

-       redef meth to_s do return self
+       redef fun to_s do return self

 end
 
 # Strings are arrays of characters.
 end
 
 # Strings are arrays of characters.

@@ -257,7 +257,7 @@ special AbstractArray[Char]
 
        redef type OTHER: String
 
 
        redef type OTHER: String
 

-       redef meth []=(index, item)
+       redef fun []=(index, item)

        do
                if index == length then
                        add(item)
        do
                if index == length then
                        add(item)

@@ -267,14 +267,14 @@ special AbstractArray[Char]
                _items[index] = item
        end
 
                _items[index] = item
        end
 

-       redef meth add(c)
+       redef fun add(c)

        do
                if _capacity <= length then enlarge(length + 5)
                _items[length] = c
                _length += 1
        end
 
        do
                if _capacity <= length then enlarge(length + 5)
                _items[length] = c
                _length += 1
        end
 

-       redef meth enlarge(cap)
+       redef fun enlarge(cap)

        do
                var c = _capacity
                if cap <= c then return
        do
                var c = _capacity
                if cap <= c then return

@@ -285,7 +285,7 @@ special AbstractArray[Char]
                _capacity = c
        end
 
                _capacity = c
        end
 

-       redef meth append(s)
+       redef fun append(s)

        do
                if s isa String then
                        var sl = s.length
        do
                if s isa String then
                        var sl = s.length

@@ -297,7 +297,7 @@ special AbstractArray[Char]
                end
        end
 
                end
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                var l = length
                var a = calloc_string(l+1)
        do
                var l = length
                var a = calloc_string(l+1)

@@ -309,7 +309,7 @@ special AbstractArray[Char]
                return new String.with_native(a, length)
        end
 
                return new String.with_native(a, length)
        end
 

-       redef meth <(s)
+       redef fun <(s)

        do
                var i = 0
                var l1 = length
        do
                var i = 0
                var l1 = length

@@ -355,7 +355,7 @@ special AbstractArray[Char]
                _length = 0
        end
 
                _length = 0
        end
 

-       redef meth ==(o)
+       redef fun ==(o)

        do
                if not o isa Buffer or o is null then return false
                var l = length
        do
                if not o isa Buffer or o is null then return false
                var l = length

@@ -370,7 +370,7 @@ special AbstractArray[Char]
                return true
        end
 
                return true
        end
 

-       readable private attr _capacity: Int 
+       readable private var _capacity: Int 

 end
 
 ###############################################################################
 end
 
 ###############################################################################

@@ -378,14 +378,14 @@ end
 ###############################################################################
 
 redef class Object
 ###############################################################################
 
 redef class Object

-       #   meth class_name: String is extern intern # The name of the class
+       #   fun class_name: String is extern intern # The name of the class

 
        # User redeable representation of `self'.
 
        # User redeable representation of `self'.

-       meth to_s: String do return inspect
+       fun to_s: String do return inspect

 
        # Developper readable representation of `self'.
        # Usualy, it uses the form "<CLASSNAME:#OBJECTID bla bla bla>"
 
        # Developper readable representation of `self'.
        # Usualy, it uses the form "<CLASSNAME:#OBJECTID bla bla bla>"

-       meth inspect: String
+       fun inspect: String

        do
                var r = inspect_head
                # r.add('>')
        do
                var r = inspect_head
                # r.add('>')

@@ -394,19 +394,19 @@ redef class Object
 
        # Return "<CLASSNAME:#OBJECTID".
        # This fuction is mainly used with the redefinition of the inspect(0) method
 
        # Return "<CLASSNAME:#OBJECTID".
        # This fuction is mainly used with the redefinition of the inspect(0) method

-       protected meth inspect_head: String
+       protected fun inspect_head: String

        do
                return "<{object_id.to_hex}"
        end
 
        do
                return "<{object_id.to_hex}"
        end
 

-       protected meth args: IndexedCollection[String]
+       protected fun args: IndexedCollection[String]

        do
                return sys.args
        end
 end
 
 redef class Bool
        do
                return sys.args
        end
 end
 
 redef class Bool

-       redef meth to_s
+       redef fun to_s

        do 
                if self then 
                        return once "true" 
        do 
                if self then 
                        return once "true" 

@@ -417,7 +417,7 @@ redef class Bool
 end
 
 redef class Int
 end
 
 redef class Int

-       meth fill_buffer(s: Buffer, base: Int, signed: Bool)
+       fun fill_buffer(s: Buffer, base: Int, signed: Bool)

        # Fill `s' with the digits in base 'base' of `self' (and with the '-' sign if 'signed' and negative).
        # assume < to_c max const of char
        do
        # Fill `s' with the digits in base 'base' of `self' (and with the '-' sign if 'signed' and negative).
        # assume < to_c max const of char
        do

@@ -442,13 +442,13 @@ redef class Int
        end
 
        # return displayable int in base 10 and signed
        end
 
        # return displayable int in base 10 and signed

-       redef meth to_s do return to_base(10,true)
+       redef fun to_s do return to_base(10,true)

        
        # return displayable int in hexadecimal (unsigned (not now))
        
        # return displayable int in hexadecimal (unsigned (not now))

-       meth to_hex: String do return to_base(16,false)
+       fun to_hex: String do return to_base(16,false)

 
        # return displayable int in base base and signed
 
        # return displayable int in base base and signed

-       meth to_base(base: Int, signed: Bool): String
+       fun to_base(base: Int, signed: Bool): String

        do
                var l = digit_count(base)
                var s = new Buffer.from(" " * l)
        do
                var l = digit_count(base)
                var s = new Buffer.from(" " * l)

@@ -458,10 +458,10 @@ redef class Int
 end
 
 redef class Float
 end
 
 redef class Float

-       redef meth to_s do return to_precision(6)
+       redef fun to_s do return to_precision(6)

 
        # `self' representation with `nb' digits after the '.'.
 
        # `self' representation with `nb' digits after the '.'.

-       meth to_precision(nb: Int): String
+       fun to_precision(nb: Int): String

        do
                if nb == 0 then return to_i.to_s
 
        do
                if nb == 0 then return to_i.to_s
 

@@ -477,7 +477,7 @@ redef class Float
 end
 
 redef class Char
 end
 
 redef class Char

-       redef meth to_s
+       redef fun to_s

        do
                var s = new Buffer.with_capacity(1)
                s[0] = self
        do
                var s = new Buffer.with_capacity(1)
                s[0] = self

@@ -487,7 +487,7 @@ end
 
 redef class Collection[E]
        # Concatenate elements.
 
 redef class Collection[E]
        # Concatenate elements.

-       redef meth to_s
+       redef fun to_s

        do
                var s = new Buffer
                for e in self do if e != null then s.append(e.to_s)
        do
                var s = new Buffer
                for e in self do if e != null then s.append(e.to_s)

@@ -495,7 +495,7 @@ redef class Collection[E]
        end
 
        # Concatenate and separate each elements with `sep'. 
        end
 
        # Concatenate and separate each elements with `sep'. 

-       meth join(sep: String): String
+       fun join(sep: String): String

        do
                if is_empty then return ""
                
        do
                if is_empty then return ""
                

@@ -520,7 +520,7 @@ end
 
 redef class Array[E]
        # Fast implementation
 
 redef class Array[E]
        # Fast implementation

-       redef meth to_s
+       redef fun to_s

        do
                var s = new Buffer
                var i = 0
        do
                var s = new Buffer
                var i = 0

@@ -536,7 +536,7 @@ end
 
 redef class Map[K,V]
        # Concatenate couple of 'key value' separate by 'couple_sep' and separate each couple with `sep'. 
 
 redef class Map[K,V]
        # Concatenate couple of 'key value' separate by 'couple_sep' and separate each couple with `sep'. 

-       meth map_join(sep: String, couple_sep: String): String
+       fun map_join(sep: String, couple_sep: String): String

        do
                if is_empty then return ""
                
        do
                if is_empty then return ""
                

@@ -567,42 +567,42 @@ end
 
 # Native strings are simple C char *
 class NativeString
 
 # Native strings are simple C char *
 class NativeString

-       meth [](index: Int): Char is intern
-       meth []=(index: Int, item: Char) is intern
-       meth copy_to(dest: NativeString, length: Int, from: Int, to: Int) is intern
+       fun [](index: Int): Char is intern
+       fun []=(index: Int, item: Char) is intern
+       fun copy_to(dest: NativeString, length: Int, from: Int, to: Int) is intern

        
        # Position of the first nul character.
        
        # Position of the first nul character.

-       meth cstring_length: Int
+       fun cstring_length: Int

        do
                var l = 0
                while self[l] != '\0' do l += 1
                return l
        end
        do
                var l = 0
                while self[l] != '\0' do l += 1
                return l
        end

-       meth atoi: Int is intern
+       fun atoi: Int is intern

 end
 
 # StringCapable objects can create native strings
 class StringCapable
 end
 
 # StringCapable objects can create native strings
 class StringCapable

-       protected meth calloc_string(size: Int): NativeString is intern
+       protected fun calloc_string(size: Int): NativeString is intern

 end
 
 redef class Sys
 end
 
 redef class Sys

-       attr _args_cache: nullable IndexedCollection[String]
+       var _args_cache: nullable IndexedCollection[String]

 
 

-       redef meth args: IndexedCollection[String]
+       redef fun args: IndexedCollection[String]

        do
                if _args_cache == null then init_args
                return _args_cache.as(not null)
        end
 
        # The name of the program as given by the OS
        do
                if _args_cache == null then init_args
                return _args_cache.as(not null)
        end
 
        # The name of the program as given by the OS

-       meth program_name: String
+       fun program_name: String

        do
                return new String.from_cstring(native_argv(0))
        end
 
        # Initialize `args' with the contents of `native_argc' and `native_argv'.
        do
                return new String.from_cstring(native_argv(0))
        end
 
        # Initialize `args' with the contents of `native_argc' and `native_argv'.

-       private meth init_args
+       private fun init_args

        do
                var argc = native_argc
                var args = new Array[String].with_capacity(0)
        do
                var argc = native_argc
                var args = new Array[String].with_capacity(0)

@@ -614,8 +614,8 @@ redef class Sys
                _args_cache = args
        end
 
                _args_cache = args
        end
 

-       private meth native_argc: Int is extern "kernel_Sys_Sys_native_argc_0" # First argument of the main C function.
+       private fun native_argc: Int is extern "kernel_Sys_Sys_native_argc_0" # First argument of the main C function.

        
        

-       private meth native_argv(i: Int): NativeString is extern "kernel_Sys_Sys_native_argv_1" # Second argument of the main C function.
+       private fun native_argv(i: Int): NativeString is extern "kernel_Sys_Sys_native_argv_1" # Second argument of the main C function.

 end
 
 end
 

diff --git a/lib/standard/string_search.nit b/lib/standard/string_search.nit
index 9279fc2..ef9256a 100644 (file)
--- a/lib/standard/string_search.nit
+++ b/lib/standard/string_search.nit
@@ -21,14 +21,14 @@ class Pattern
        # Search `self' into `s' from a certain position.
        # Return the position of the first character of the matching section.
        # Return -1 if not found.
        # Search `self' into `s' from a certain position.
        # Return the position of the first character of the matching section.
        # Return -1 if not found.

-       meth search_index_in(s: String, from: Int): Int is abstract
+       fun search_index_in(s: String, from: Int): Int is abstract

 
        # Search `self' into `s' from a certain position.
        # Return null if not found.
 
        # Search `self' into `s' from a certain position.
        # Return null if not found.

-       meth search_in(s: String, from: Int): nullable Match is abstract
+       fun search_in(s: String, from: Int): nullable Match is abstract

 
        # Search all `self' occucences into `s'.
 
        # Search all `self' occucences into `s'.

-       meth search_all_in(s: String): Array[Match]
+       fun search_all_in(s: String): Array[Match]

        do
                var res = new Array[Match] # Result
                var match = search_in(s, 0)
        do
                var res = new Array[Match] # Result
                var match = search_in(s, 0)

@@ -40,7 +40,7 @@ class Pattern
        end
 
        # Split `s' using `self' is separator.
        end
 
        # Split `s' using `self' is separator.

-       meth split_in(s: String): Array[Match]
+       fun split_in(s: String): Array[Match]

        do
                var res = new Array[Match] # Result
                var i = 0 # Cursor
        do
                var res = new Array[Match] # Result
                var i = 0 # Cursor

@@ -64,10 +64,10 @@ end
 # see also http://www.cs.utexas.edu/users/moore/best-ideas/string-searching/index.html
 class BM_Pattern
 special Pattern 
 # see also http://www.cs.utexas.edu/users/moore/best-ideas/string-searching/index.html
 class BM_Pattern
 special Pattern 

-       redef meth to_s do return _motif
+       redef fun to_s do return _motif

 
        # boyer-moore search gives the position of the first occurence of a pattern starting at position `from'
 
        # boyer-moore search gives the position of the first occurence of a pattern starting at position `from'

-       redef meth search_index_in(s, from)
+       redef fun search_index_in(s, from)

        do
                assert from >= 0
                var n = s.length
        do
                assert from >= 0
                var n = s.length

@@ -94,7 +94,7 @@ special Pattern
        end
 
        # boyer-moore search. Return null if not found 
        end
 
        # boyer-moore search. Return null if not found 

-       redef meth search_in(s, from)
+       redef fun search_in(s, from)

        do
                var to = search_index_in(s, from)
                if to < 0 then
        do
                var to = search_index_in(s, from)
                if to < 0 then

@@ -116,12 +116,12 @@ special Pattern
        end
 
        # searched motif
        end
 
        # searched motif

-       attr _motif: String
+       var _motif: String

 
        # length of the motif
 
        # length of the motif

-       attr _length: Int
+       var _length: Int

 
 

-       private meth bc(e: Char): Int
+       private fun bc(e: Char): Int

        do 
                if _bc_table.has_key(e) then
                        return _bc_table[e]
        do 
                if _bc_table.has_key(e) then
                        return _bc_table[e]

@@ -131,12 +131,12 @@ special Pattern
        end
 
        # good shifts
        end
 
        # good shifts

-       attr _gs: Array[Int]
+       var _gs: Array[Int]

        
        # bad characters
        
        # bad characters

-       attr _bc_table: Map[Char, Int]
+       var _bc_table: Map[Char, Int]

 
 

-       private meth compute_bc
+       private fun compute_bc

        do
                var x = _motif
                var m = _length
        do
                var x = _motif
                var m = _length

@@ -147,7 +147,7 @@ special Pattern
                end
        end
 
                end
        end
 

-       private meth suffixes: Array[Int]
+       private fun suffixes: Array[Int]

        do
                var x = _motif
                var m = _length
        do
                var x = _motif
                var m = _length

@@ -170,7 +170,7 @@ special Pattern
                return suff
        end
 
                return suff
        end
 

-       private meth compute_gs
+       private fun compute_gs

        do
                var x = _motif
                var m = _length
        do
                var x = _motif
                var m = _length

@@ -202,20 +202,20 @@ end
 # Matches are a part of a string.
 class Match
        # The base string matched
 # Matches are a part of a string.
 class Match
        # The base string matched

-       readable attr _string: String
+       readable var _string: String

 
        # The starting position in the string
 
        # The starting position in the string

-       readable attr _from: Int
+       readable var _from: Int

 
        # The length of the mathching part
 
        # The length of the mathching part

-       readable attr _length: Int
+       readable var _length: Int

 
        # The position of the first character just after the matching part.
        # May be out of the base string
 
        # The position of the first character just after the matching part.
        # May be out of the base string

-       meth after: Int do return _from + _length
+       fun after: Int do return _from + _length

 
        # The contents of the mathing part
 
        # The contents of the mathing part

-       redef meth to_s do return _string.substring(_from, _length)
+       redef fun to_s do return _string.substring(_from, _length)

 
        # Matches `len' characters of `s' from `f'.
        init(s: String, f: Int, len: Int)
 
        # Matches `len' characters of `s' from `f'.
        init(s: String, f: Int, len: Int)

@@ -231,7 +231,7 @@ end
 
 redef class Char
 special Pattern
 
 redef class Char
 special Pattern

-       redef meth search_index_in(s, from)
+       redef fun search_index_in(s, from)

        do
                var stop = s.length
                while from < stop do
        do
                var stop = s.length
                while from < stop do

@@ -241,7 +241,7 @@ special Pattern
                return -1
        end
 
                return -1
        end
 

-       redef meth search_in(s, from)
+       redef fun search_in(s, from)

        do
                var pos = search_index_in(s, from)
                if pos < 0 then
        do
                var pos = search_index_in(s, from)
                if pos < 0 then

@@ -254,7 +254,7 @@ end
 
 redef class String
 special Pattern
 
 redef class String
 special Pattern

-       redef meth search_index_in(s, from)
+       redef fun search_index_in(s, from)

        do
                assert from >= 0
                var stop = s.length - length + 1
        do
                assert from >= 0
                var stop = s.length - length + 1

@@ -269,7 +269,7 @@ special Pattern
                return -1
        end
 
                return -1
        end
 

-       redef meth search_in(s, from)
+       redef fun search_in(s, from)

        do
                var pos = search_index_in(s, from)
                if pos < 0 then
        do
                var pos = search_index_in(s, from)
                if pos < 0 then

@@ -280,12 +280,12 @@ special Pattern
        end
 
        # Like `search_from' but from the first chararter.
        end
 
        # Like `search_from' but from the first chararter.

-       meth search(p: Pattern): nullable Match do return p.search_in(self, 0)
+       fun search(p: Pattern): nullable Match do return p.search_in(self, 0)

 
        # Search the given pattern into self from a.
        # The search starts at `from'.
        # Return null if not found.
 
        # Search the given pattern into self from a.
        # The search starts at `from'.
        # Return null if not found.

-       meth search_from(p: Pattern, from: Int): nullable Match do return p.search_in(self, from)
+       fun search_from(p: Pattern, from: Int): nullable Match do return p.search_in(self, from)

 
        # Search all occurences of p into self.
        #
 
        # Search all occurences of p into self.
        #

@@ -294,11 +294,11 @@ special Pattern
        #       a.add(i.from)
        #   end
        #   a    # -> [4, 7]
        #       a.add(i.from)
        #   end
        #   a    # -> [4, 7]

-       meth search_all(p: Pattern): Array[Match] do return p.search_all_in(self)
+       fun search_all(p: Pattern): Array[Match] do return p.search_all_in(self)

 
        # Split self using p is separator.
        #   "hello world".split('o')     # -> ["hell", " w", "rld"]
 
        # Split self using p is separator.
        #   "hello world".split('o')     # -> ["hell", " w", "rld"]

-       meth split_with(p: Pattern): Array[String]
+       fun split_with(p: Pattern): Array[String]

        do
                var matches = p.split_in(self)
                var res = new Array[String].with_capacity(matches.length)
        do
                var matches = p.split_in(self)
                var res = new Array[String].with_capacity(matches.length)

@@ -308,5 +308,5 @@ special Pattern
 
        # Split self using '\n' is separator.
        #   "hello\nworld".split     # -> ["hello","world"]
 
        # Split self using '\n' is separator.
        #   "hello\nworld".split     # -> ["hello","world"]

-       meth split: Array[String] do return split_with('\n')
+       fun split: Array[String] do return split_with('\n')

 end
 end

diff --git a/lib/standard/symbol.nit b/lib/standard/symbol.nit
index d953f36..db15b75 100644 (file)
--- a/lib/standard/symbol.nit
+++ b/lib/standard/symbol.nit
@@ -18,7 +18,7 @@ private import hash
 
 redef class String
        # Get the unique corresponding to the string
 
 redef class String
        # Get the unique corresponding to the string

-       meth to_symbol: Symbol
+       fun to_symbol: Symbol

        do
                var symbol_dictionary = once new HashMap[String, Symbol]
                if symbol_dictionary.has_key(self) then
        do
                var symbol_dictionary = once new HashMap[String, Symbol]
                if symbol_dictionary.has_key(self) then

@@ -33,8 +33,8 @@ end
 
 # A symbol is a unique unmutable string
 class Symbol
 
 # A symbol is a unique unmutable string
 class Symbol

-       attr _string: String
-       redef meth to_s do return _string.to_s
+       var _string: String
+       redef fun to_s do return _string.to_s

 
        # Only used by String::to_symbol
        private init(s: String) do _string = s
 
        # Only used by String::to_symbol
        private init(s: String) do _string = s

diff --git a/lib/standard/time.nit b/lib/standard/time.nit
index 043d075..a1f3424 100644 (file)
--- a/lib/standard/time.nit
+++ b/lib/standard/time.nit
@@ -15,5 +15,5 @@ package time
 import kernel
 
 redef class Object
 import kernel
 
 redef class Object

-       protected meth get_time: Int is extern "kernel_Any_Any_get_time_0"
+       protected fun get_time: Int is extern "kernel_Any_Any_get_time_0"

 end
 end

diff --git a/src/abstracttool.nit b/src/abstracttool.nit
index b03c827..e6a5dbf 100644 (file)
--- a/src/abstracttool.nit
+++ b/src/abstracttool.nit
@@ -35,9 +35,9 @@ special ToolContext
 
        # The name of the tool
        # Used in help messages for instance
 
        # The name of the tool
        # Used in help messages for instance

-       readable attr _tool_name: String
+       readable var _tool_name: String

 
 

-       meth exec_cmd_line
+       fun exec_cmd_line

        do
                process_options
 
        do
                process_options
 

@@ -73,9 +73,9 @@ special ToolContext
                end
        end
 
                end
        end
 

-       meth perform_work(mods: Array[MMModule]) is abstract
+       fun perform_work(mods: Array[MMModule]) is abstract

 
 

-       meth dump_context_info
+       fun dump_context_info

        do
                for mod in module_hierarchy do
                        mod.dump_module_info
        do
                for mod in module_hierarchy do
                        mod.dump_module_info

@@ -95,7 +95,7 @@ special ToolContext
 end
 
 redef class MMModule
 end
 
 redef class MMModule

-       meth dump_module_info
+       fun dump_module_info

        do
                var p = filename.file_path
                var fname = "{p}/{name}"
        do
                var p = filename.file_path
                var fname = "{p}/{name}"

@@ -113,7 +113,7 @@ redef class MMModule
 end
 
 redef class MMLocalClass
 end
 
 redef class MMLocalClass

-       meth dump_properties(file: OStream)
+       fun dump_properties(file: OStream)

        do
                file.write("class {self}\n")
                for p in global_properties do
        do
                file.write("class {self}\n")
                for p in global_properties do

diff --git a/src/compiling/compiling.nit b/src/compiling/compiling.nit
index 3ce3798..a063ca5 100644 (file)
--- a/src/compiling/compiling.nit
+++ b/src/compiling/compiling.nit
@@ -26,7 +26,7 @@ redef class MMSrcModule
        # Compile the program
        # Generate all sep files (_sep.[ch]), the main file (_table.c) and the build file (_build.sh)
        # Then execute the build.sh
        # Compile the program
        # Generate all sep files (_sep.[ch]), the main file (_table.c) and the build file (_build.sh)
        # Then execute the build.sh

-       meth compile_prog_to_c(tc: ToolContext)
+       fun compile_prog_to_c(tc: ToolContext)

        do
                for m in mhe.greaters_and_self do
                        assert m isa MMSrcModule
        do
                for m in mhe.greaters_and_self do
                        assert m isa MMSrcModule

@@ -78,7 +78,7 @@ redef class MMSrcModule
        end
 
        # Compile the main file
        end
 
        # Compile the main file

-       private meth compile_main(tc: ToolContext, ga: GlobalAnalysis)
+       private fun compile_main(tc: ToolContext, ga: GlobalAnalysis)

        do
                var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")
        do
                var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")

@@ -94,7 +94,7 @@ redef class MMSrcModule
        end
 
        # Compile the sep files (of the current module only)
        end
 
        # Compile the sep files (of the current module only)

-       private meth compile_separate_module(tc: ToolContext, ga: GlobalAnalysis)
+       private fun compile_separate_module(tc: ToolContext, ga: GlobalAnalysis)

        do
                var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")
        do
                var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")

diff --git a/src/compiling/compiling_base.nit b/src/compiling/compiling_base.nit
index 3fcdf8d..d61e55c 100644 (file)
--- a/src/compiling/compiling_base.nit
+++ b/src/compiling/compiling_base.nit
@@ -21,14 +21,14 @@ import syntax
 private import utils
 
 redef class ToolContext
 private import utils
 
 redef class ToolContext

-       readable writable attr _global: Bool = false
-       readable writable attr _compdir: nullable String = null
-       readable writable attr _clibdir: nullable String = null
-       readable writable attr _bindir: nullable String = null
-       readable writable attr _output_file: nullable String = null
-       readable writable attr _boost: Bool = false
-       readable writable attr _no_cc: Bool = false
-       readable writable attr _ext_prefix: String = ""
+       readable writable var _global: Bool = false
+       readable writable var _compdir: nullable String = null
+       readable writable var _clibdir: nullable String = null
+       readable writable var _bindir: nullable String = null
+       readable writable var _output_file: nullable String = null
+       readable writable var _boost: Bool = false
+       readable writable var _no_cc: Bool = false
+       readable writable var _ext_prefix: String = ""

 end
 
 # Class used to generate files.
 end
 
 # Class used to generate files.

@@ -36,7 +36,7 @@ end
 # Note also that this class is unefficient and poorly designed thus requires love.
 class CompilerVisitor
        # Add a line in the current declaration block
 # Note also that this class is unefficient and poorly designed thus requires love.
 class CompilerVisitor
        # Add a line in the current declaration block

-       meth add_decl(s: String)
+       fun add_decl(s: String)

        do
                if _indent_level >= 8 then
                        _ctx.decls.add("\t\t" + s)
        do
                if _indent_level >= 8 then
                        _ctx.decls.add("\t\t" + s)

@@ -46,7 +46,7 @@ class CompilerVisitor
        end
 
        # Add a line in the current instr block
        end
 
        # Add a line in the current instr block

-       meth add_instr(s: String)
+       fun add_instr(s: String)

        do
                if _indent_level >= 8 then
                        _ctx.instrs.add("\t\t" + s)
        do
                if _indent_level >= 8 then
                        _ctx.instrs.add("\t\t" + s)

@@ -56,28 +56,28 @@ class CompilerVisitor
        end
 
        # Return a unique new number for the instance
        end
 
        # Return a unique new number for the instance

-       meth new_number: Int
+       fun new_number: Int

        do
                var res = _number_cpt
                _number_cpt = res + 1
                return res
        end
        # next number for new_number
        do
                var res = _number_cpt
                _number_cpt = res + 1
                return res
        end
        # next number for new_number

-       attr _number_cpt: Int = 0
+       var _number_cpt: Int = 0

 
        # Add an indent level.
        # New decl and instr will be indented.
 
        # Add an indent level.
        # New decl and instr will be indented.

-       meth indent do _indent_level += 1
+       fun indent do _indent_level += 1

 
        # Remove an indent level.
 
        # Remove an indent level.

-       meth unindent
+       fun unindent

        do
                _indent_level -= 1
                if _indent_level < 0 then _indent_level = 0
        end
 
        # Return a big string containing all decl and instr
        do
                _indent_level -= 1
                if _indent_level < 0 then _indent_level = 0
        end
 
        # Return a big string containing all decl and instr

-       redef meth to_s
+       redef fun to_s

        do
                var out = new Array[String]
                out.append(_ctx.decls)
        do
                var out = new Array[String]
                out.append(_ctx.decls)

@@ -87,16 +87,16 @@ class CompilerVisitor
        end
 
        # The processed module
        end
 
        # The processed module

-       readable attr _module: MMSrcModule
+       readable var _module: MMSrcModule

 
        # Where instr and decl are stored
 
        # Where instr and decl are stored

-       readable writable attr _ctx: CContext = new CContext
+       readable writable var _ctx: CContext = new CContext

 
        # The current indent lever
 
        # The current indent lever

-       readable writable attr _indent_level: Int = 0
+       readable writable var _indent_level: Int = 0

 
        # The ToolContext info
 
        # The ToolContext info

-       readable attr _tc: ToolContext
+       readable var _tc: ToolContext

 
        # Create a new CompilerVisitor based on a module
        init(module: MMSrcModule, tc: ToolContext)
 
        # Create a new CompilerVisitor based on a module
        init(module: MMSrcModule, tc: ToolContext)

@@ -109,16 +109,16 @@ end
 # Where instr and decl are stored for a module
 # Note that this class is as badly designed as CompilerVisitor
 class CContext
 # Where instr and decl are stored for a module
 # Note that this class is as badly designed as CompilerVisitor
 class CContext

-       readable attr _decls: Array[String] = new Array[String] 
-       readable attr _instrs: Array[String] = new Array[String]
+       readable var _decls: Array[String] = new Array[String] 
+       readable var _instrs: Array[String] = new Array[String]

 
 

-       meth append(c: CContext)
+       fun append(c: CContext)

        do
                _instrs.append(c.decls)
                _instrs.append(c.instrs)
        end
        
        do
                _instrs.append(c.decls)
                _instrs.append(c.instrs)
        end
        

-       meth merge(c: CContext)
+       fun merge(c: CContext)

        do
                _decls.append(c.decls)
                _instrs.append(c.instrs)
        do
                _decls.append(c.decls)
                _instrs.append(c.instrs)

@@ -129,13 +129,13 @@ end
 
 redef class MMGlobalProperty
        # C symbol refering a method inocation
 
 redef class MMGlobalProperty
        # C symbol refering a method inocation

-       meth meth_call: String
+       fun meth_call: String

        do
                return "CALL_{intro.cname}"
        end
 
        # C symbol refering an attribure access
        do
                return "CALL_{intro.cname}"
        end
 
        # C symbol refering an attribure access

-       meth attr_access: String
+       fun attr_access: String

        do
                return "ATTR_{intro.cname}"
        end
        do
                return "ATTR_{intro.cname}"
        end

@@ -143,19 +143,19 @@ end
 
 redef class MMGlobalClass
        # C symbol refering the identifier of the class
 
 redef class MMGlobalClass
        # C symbol refering the identifier of the class

-       meth id_id: String
+       fun id_id: String

        do
                return "ID_{intro.name}"
        end
 
        # C symbol refering the color of the class (for subtype tests)
        do
                return "ID_{intro.name}"
        end
 
        # C symbol refering the color of the class (for subtype tests)

-       meth color_id: String
+       fun color_id: String

        do
                return "COLOR_{intro.name}"
        end
 
        # C symbol refering the init table position of the class (for constructor linearization)
        do
                return "COLOR_{intro.name}"
        end
 
        # C symbol refering the init table position of the class (for constructor linearization)

-       meth init_table_pos_id: String
+       fun init_table_pos_id: String

        do
                return "INIT_TABLE_POS_{intro.name}"
        end
        do
                return "INIT_TABLE_POS_{intro.name}"
        end

@@ -163,15 +163,15 @@ end
 
 redef class MMLocalClass
        # Cached primitive_info result
 
 redef class MMLocalClass
        # Cached primitive_info result

-       attr _primitive_info_cache: nullable PrimitiveInfo = null
+       var _primitive_info_cache: nullable PrimitiveInfo = null

 
        # If primitive_info result cached?
 
        # If primitive_info result cached?

-       attr _primitive_info_b: Bool = false
+       var _primitive_info_b: Bool = false

 
        # Return the primitive information of the class.
        # Return null if the class is not primitive
        # FIXME: Only here since there is no universal type yet
 
        # Return the primitive information of the class.
        # Return null if the class is not primitive
        # FIXME: Only here since there is no universal type yet

-       meth primitive_info: nullable PrimitiveInfo
+       fun primitive_info: nullable PrimitiveInfo

        do
                if _primitive_info_b == true then return _primitive_info_cache
 
        do
                if _primitive_info_b == true then return _primitive_info_cache
 

@@ -199,7 +199,7 @@ redef class MMLocalClass
        end
 
        # Static information of primitive types
        end
 
        # Static information of primitive types

-       private meth primitive_ctypes: HashMap[Symbol, PrimitiveInfo]
+       private fun primitive_ctypes: HashMap[Symbol, PrimitiveInfo]

        do
                var res = new HashMap[Symbol, PrimitiveInfo]
                var pnames = ["Int",    "Char", "Bool", "Float", "NativeString", "NativeArray", "Pointer"]
        do
                var res = new HashMap[Symbol, PrimitiveInfo]
                var pnames = ["Int",    "Char", "Bool", "Float", "NativeString", "NativeArray", "Pointer"]

@@ -217,13 +217,13 @@ end
 # Information about a primitive class
 class PrimitiveInfo
        # The name of the class
 # Information about a primitive class
 class PrimitiveInfo
        # The name of the class

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # Is the class tagged (aka not boxed)
 
        # Is the class tagged (aka not boxed)

-       readable attr _tagged: Bool
+       readable var _tagged: Bool

 
        # The corresponding c type for the primitive value
 
        # The corresponding c type for the primitive value

-       readable attr _cname: String
+       readable var _cname: String

 
        private init(n: Symbol, t: Bool, c: String)
        do
 
        private init(n: Symbol, t: Bool, c: String)
        do

@@ -235,7 +235,7 @@ end
 
 redef class MMType
        # The corresponding c type
 
 redef class MMType
        # The corresponding c type

-       meth cname: String
+       fun cname: String

        do
                var pi = local_class.primitive_info
                if pi == null then
        do
                var pi = local_class.primitive_info
                if pi == null then

@@ -247,7 +247,7 @@ redef class MMType
 
        # The default c value for uninitialized types.
        # Return "null" for non primitive types and something more specific for primitive types
 
        # The default c value for uninitialized types.
        # Return "null" for non primitive types and something more specific for primitive types

-       meth default_cvalue: String
+       fun default_cvalue: String

        do
                var pi = local_class.primitive_info
                if pi != null and pi.tagged then
        do
                var pi = local_class.primitive_info
                if pi != null and pi.tagged then

@@ -259,7 +259,7 @@ redef class MMType
 
        # Box (or tag) a primitive value
        # Is identity if not primitive
 
        # Box (or tag) a primitive value
        # Is identity if not primitive

-       meth boxtype(s: String): String
+       fun boxtype(s: String): String

        do
                var pi = local_class.primitive_info
                if pi == null then
        do
                var pi = local_class.primitive_info
                if pi == null then

@@ -273,7 +273,7 @@ redef class MMType
 
        # Unbox (or untag) a primitive value
        # Is identity if not primitive
 
        # Unbox (or untag) a primitive value
        # Is identity if not primitive

-       meth unboxtype(s: String): String
+       fun unboxtype(s: String): String

        do
                var pi = local_class.primitive_info
                if pi == null then
        do
                var pi = local_class.primitive_info
                if pi == null then

@@ -288,10 +288,10 @@ end
 
 redef class MMLocalProperty
        # Cacher result of cname
 
 redef class MMLocalProperty
        # Cacher result of cname

-       attr _cname_cache: nullable String
+       var _cname_cache: nullable String

 
        # The mangled name of the method
 
        # The mangled name of the method

-       meth cname: String
+       fun cname: String

        do
                var cname = _cname_cache
                if cname == null then
        do
                var cname = _cname_cache
                if cname == null then

@@ -302,7 +302,7 @@ redef class MMLocalProperty
        end
 
        # C macro used to get the function for the call of a super property
        end
 
        # C macro used to get the function for the call of a super property

-       meth super_meth_call: String
+       fun super_meth_call: String

        do
                return "CALL_SUPER_{cname}"
        end
        do
                return "CALL_SUPER_{cname}"
        end

diff --git a/src/compiling/compiling_global.nit b/src/compiling/compiling_global.nit
index d2a4616..d2217f8 100644 (file)
--- a/src/compiling/compiling_global.nit
+++ b/src/compiling/compiling_global.nit
@@ -23,22 +23,22 @@ private import syntax
 
 # Something that store color of table elements
 class ColorContext
 
 # Something that store color of table elements
 class ColorContext

-       attr _colors: HashMap[TableElt, Int] = new HashMap[TableElt, Int]
+       var _colors: HashMap[TableElt, Int] = new HashMap[TableElt, Int]

 
        # The color of a table element.
 
        # The color of a table element.

-       meth color(e: TableElt): Int
+       fun color(e: TableElt): Int

        do
                return _colors[e]
        end
 
        # Is a table element already colored?
        do
                return _colors[e]
        end
 
        # Is a table element already colored?

-       meth has_color(e: TableElt): Bool
+       fun has_color(e: TableElt): Bool

        do
                return _colors.has_key(e)
        end
 
        # Assign a color to a table element.
        do
                return _colors.has_key(e)
        end
 
        # Assign a color to a table element.

-       meth color=(e: TableElt, c: Int)
+       fun color=(e: TableElt, c: Int)

        do
                _colors[e] = c
                var idx = c
        do
                _colors[e] = c
                var idx = c

@@ -53,13 +53,13 @@ end
 class GlobalAnalysis
 special ColorContext
        # Associate global classes to compiled classes
 class GlobalAnalysis
 special ColorContext
        # Associate global classes to compiled classes

-       readable attr _compiled_classes: HashMap[MMGlobalClass, CompiledClass] = new HashMap[MMGlobalClass, CompiledClass]
+       readable var _compiled_classes: HashMap[MMGlobalClass, CompiledClass] = new HashMap[MMGlobalClass, CompiledClass]

 
        # The main module of the program globally analysed
 
        # The main module of the program globally analysed

-       readable attr _module: MMModule
+       readable var _module: MMModule

 
        # FIXME: do something better.
 
        # FIXME: do something better.

-       readable writable attr _max_class_table_length: Int = 0
+       readable writable var _max_class_table_length: Int = 0

 
        init(module: MMSrcModule)
        do
 
        init(module: MMSrcModule)
        do

@@ -70,7 +70,7 @@ end
 class GlobalCompilerVisitor
 special CompilerVisitor
        # The global analysis result
 class GlobalCompilerVisitor
 special CompilerVisitor
        # The global analysis result

-       readable attr _global_analysis: GlobalAnalysis
+       readable var _global_analysis: GlobalAnalysis

        init(m: MMSrcModule, tc: ToolContext, ga: GlobalAnalysis)
        do
                super(m, tc)
        init(m: MMSrcModule, tc: ToolContext, ga: GlobalAnalysis)
        do
                super(m, tc)

@@ -82,39 +82,39 @@ end
 class CompiledClass
 special ColorContext
        # The corresponding local class in the main module of the prgram
 class CompiledClass
 special ColorContext
        # The corresponding local class in the main module of the prgram

-       readable attr _local_class: MMLocalClass
+       readable var _local_class: MMLocalClass

 
        # The identifier of the class
 
        # The identifier of the class

-       readable writable attr _id: Int = 0
+       readable writable var _id: Int = 0

 
        # The full class table of the class
 
        # The full class table of the class

-       readable attr _class_table: Array[nullable TableElt] = new Array[nullable TableElt]
+       readable var _class_table: Array[nullable TableElt] = new Array[nullable TableElt]

 
        # The full instance table of the class
 
        # The full instance table of the class

-       readable attr _instance_table: Array[nullable TableElt] = new Array[nullable TableElt]
+       readable var _instance_table: Array[nullable TableElt] = new Array[nullable TableElt]

 
        # The proper class table part (no superclasses but all refinements)
 
        # The proper class table part (no superclasses but all refinements)

-       readable writable attr _class_layout: TableEltComposite = new TableEltComposite(self)
+       readable writable var _class_layout: TableEltComposite = new TableEltComposite(self)

 
        # The proper instance table part (no superclasses but all refinements)
 
        # The proper instance table part (no superclasses but all refinements)

-       readable writable attr _instance_layout: TableEltComposite = new TableEltComposite(self)
+       readable writable var _instance_layout: TableEltComposite = new TableEltComposite(self)

 
        init(c: MMLocalClass) do _local_class = c
 end
 
 redef class MMSrcLocalClass
        # The table element of the subtype check
 
        init(c: MMLocalClass) do _local_class = c
 end
 
 redef class MMSrcLocalClass
        # The table element of the subtype check

-       meth class_color_pos: TableEltClassColor do return _class_color_pos.as(not null)
-       attr _class_color_pos: nullable TableEltClassColor
+       fun class_color_pos: TableEltClassColor do return _class_color_pos.as(not null)
+       var _class_color_pos: nullable TableEltClassColor

 
        # The proper local class table part (nor superclasses nor refinments)
 
        # The proper local class table part (nor superclasses nor refinments)

-       readable attr _class_layout: Array[TableElt] = new Array[TableElt]
+       readable var _class_layout: Array[TableElt] = new Array[TableElt]

 
        # The proper local instance table part (nor superclasses nor refinments)
 
        # The proper local instance table part (nor superclasses nor refinments)

-       readable attr _instance_layout: Array[TableElt] = new Array[TableElt]
+       readable var _instance_layout: Array[TableElt] = new Array[TableElt]

 
        # Build the local layout of the class and feed the module table
 
        # Build the local layout of the class and feed the module table

-       meth build_layout_in(tc: ToolContext, module_table: Array[ModuleTableElt])
+       fun build_layout_in(tc: ToolContext, module_table: Array[ModuleTableElt])

        do
                var clt = _class_layout
                var ilt = _instance_layout
        do
                var clt = _class_layout
                var ilt = _instance_layout

@@ -156,10 +156,10 @@ end
 
 redef class MMSrcModule
        # The local table of the module (refers things introduced in the module)
 
 redef class MMSrcModule
        # The local table of the module (refers things introduced in the module)

-       attr _local_table: Array[ModuleTableElt] = new Array[ModuleTableElt]
+       var _local_table: Array[ModuleTableElt] = new Array[ModuleTableElt]

 
        # Builds the local tables and local classes layouts
 
        # Builds the local tables and local classes layouts

-       meth local_analysis(tc: ToolContext)
+       fun local_analysis(tc: ToolContext)

        do
                for c in src_local_classes do
                        c.build_layout_in(tc, _local_table)
        do
                for c in src_local_classes do
                        c.build_layout_in(tc, _local_table)

@@ -167,7 +167,7 @@ redef class MMSrcModule
        end
 
        # Do the complete global analysis
        end
 
        # Do the complete global analysis

-       meth global_analysis(cctx: ToolContext): GlobalAnalysis
+       fun global_analysis(cctx: ToolContext): GlobalAnalysis

        do
                #print "Do the complete global analysis"
                var ga = new GlobalAnalysis(self)
        do
                #print "Do the complete global analysis"
                var ga = new GlobalAnalysis(self)

@@ -319,7 +319,7 @@ redef class MMSrcModule
                return ga
        end
 
                return ga
        end
 

-       private meth append_to_table(cc: ColorContext, table: Array[nullable TableElt], cmp: TableEltComposite)
+       private fun append_to_table(cc: ColorContext, table: Array[nullable TableElt], cmp: TableEltComposite)

        do
                for j in [0..cmp.length[ do
                        var e = cmp.item(j)
        do
                for j in [0..cmp.length[ do
                        var e = cmp.item(j)

@@ -328,7 +328,7 @@ redef class MMSrcModule
                end
        end
 
                end
        end
 

-       private meth build_tables_in(table: Array[nullable TableElt], ga: GlobalAnalysis, c: MMLocalClass, elts: Array[TableElt])
+       private fun build_tables_in(table: Array[nullable TableElt], ga: GlobalAnalysis, c: MMLocalClass, elts: Array[TableElt])

        do
                var tab = new HashMap[Int, TableElt]
                var len = 0
        do
                var tab = new HashMap[Int, TableElt]
                var len = 0

@@ -358,7 +358,7 @@ redef class MMSrcModule
        end
 
        # Perform coloring
        end
 
        # Perform coloring

-       meth colorize(ga: GlobalAnalysis, elts: Array[TableElt], classes: Collection[MMLocalClass], startcolor: Int)
+       fun colorize(ga: GlobalAnalysis, elts: Array[TableElt], classes: Collection[MMLocalClass], startcolor: Int)

        do
                var colors = new HashMap[Int, Array[TableElt]]
                var rel_classes = new Array[MMLocalClass]
        do
                var colors = new HashMap[Int, Array[TableElt]]
                var rel_classes = new Array[MMLocalClass]

@@ -401,7 +401,7 @@ redef class MMSrcModule
                end
        end
 
                end
        end
 

-       private meth free_color(es: Array[TableElt], c: MMLocalClass): Bool
+       private fun free_color(es: Array[TableElt], c: MMLocalClass): Bool

        do
                for e2 in es do
                        if e2.is_related_to(c) then
        do
                for e2 in es do
                        if e2.is_related_to(c) then

@@ -412,7 +412,7 @@ redef class MMSrcModule
        end
 
        # Compile module and class tables
        end
 
        # Compile module and class tables

-       meth compile_tables_to_c(v: GlobalCompilerVisitor)
+       fun compile_tables_to_c(v: GlobalCompilerVisitor)

        do
                for m in mhe.greaters_and_self do
                        assert m isa MMSrcModule
        do
                for m in mhe.greaters_and_self do
                        assert m isa MMSrcModule

@@ -435,7 +435,7 @@ redef class MMSrcModule
        end
 
        # Declare class table (for _sep.h)
        end
 
        # Declare class table (for _sep.h)

-       meth declare_class_tables_to_c(v: GlobalCompilerVisitor)
+       fun declare_class_tables_to_c(v: GlobalCompilerVisitor)

        do
                for c in local_classes do
                        if c.global.module == self then
        do
                for c in local_classes do
                        if c.global.module == self then

@@ -445,7 +445,7 @@ redef class MMSrcModule
        end
 
        # Compile main part (for _table.c)
        end
 
        # Compile main part (for _table.c)

-       meth compile_main_part(v: GlobalCompilerVisitor)
+       fun compile_main_part(v: GlobalCompilerVisitor)

        do
                v.add_instr("int main(int argc, char **argv) \{")
                v.indent
        do
                v.add_instr("int main(int argc, char **argv) \{")
                v.indent

@@ -471,7 +471,7 @@ redef class MMSrcModule
        end
 
        # Compile sep files
        end
 
        # Compile sep files

-       meth compile_mod_to_c(v: GlobalCompilerVisitor)
+       fun compile_mod_to_c(v: GlobalCompilerVisitor)

        do
                v.add_decl("extern const char *LOCATE_{name};")
                if not v.tc.global then
        do
                v.add_decl("extern const char *LOCATE_{name};")
                if not v.tc.global then

@@ -507,7 +507,7 @@ redef class MMSrcModule
        end
 
        # Compile module file for the current module
        end
 
        # Compile module file for the current module

-       meth compile_local_table_to_c(v: GlobalCompilerVisitor)
+       fun compile_local_table_to_c(v: GlobalCompilerVisitor)

        do
                v.add_instr("const char *LOCATE_{name} = \"{filename}\";")
 
        do
                v.add_instr("const char *LOCATE_{name} = \"{filename}\";")
 

@@ -530,7 +530,7 @@ end
 # An element of a class, an instance or a module table
 abstract class AbsTableElt
        # Compile the macro needed to use the element and other related elements
 # An element of a class, an instance or a module table
 abstract class AbsTableElt
        # Compile the macro needed to use the element and other related elements

-       meth compile_macros(v: GlobalCompilerVisitor, value: String) is abstract
+       fun compile_macros(v: GlobalCompilerVisitor, value: String) is abstract

 end
 
 # An element of a class or an instance table
 end
 
 # An element of a class or an instance table

@@ -538,16 +538,16 @@ end
 abstract class TableElt
 special AbsTableElt
        # Is the element conflict to class `c' (used for coloring)
 abstract class TableElt
 special AbsTableElt
        # Is the element conflict to class `c' (used for coloring)

-       meth is_related_to(c: MMLocalClass): Bool is abstract
+       fun is_related_to(c: MMLocalClass): Bool is abstract

 
        # Number of sub-elements. 1 if none
 
        # Number of sub-elements. 1 if none

-       meth length: Int do return 1
+       fun length: Int do return 1

 
        # Access the ith subelement.
 
        # Access the ith subelement.

-       meth item(i: Int): TableElt do return self
+       fun item(i: Int): TableElt do return self

 
        # Return the value of the element for a given class
 
        # Return the value of the element for a given class

-       meth compile_to_c(v: GlobalCompilerVisitor, c: MMLocalClass): String is abstract
+       fun compile_to_c(v: GlobalCompilerVisitor, c: MMLocalClass): String is abstract

 end
 
 # An element of a module table
 end
 
 # An element of a module table

@@ -555,16 +555,16 @@ end
 abstract class ModuleTableElt
 special AbsTableElt
        # Return the value of the element once the global analisys is performed
 abstract class ModuleTableElt
 special AbsTableElt
        # Return the value of the element once the global analisys is performed

-       meth value(ga: GlobalAnalysis): String is abstract
+       fun value(ga: GlobalAnalysis): String is abstract

 end
 
 # An element of a module table that represents a group of TableElt defined in the same local class
 class ModuleTableEltGroup
 special ModuleTableElt
 end
 
 # An element of a module table that represents a group of TableElt defined in the same local class
 class ModuleTableEltGroup
 special ModuleTableElt

-       readable attr _elements: Array[TableElt] = new Array[TableElt]
+       readable var _elements: Array[TableElt] = new Array[TableElt]

 
 

-       redef meth value(ga) do return "{ga.color(_elements.first)} /* Group of ? */"
-       redef meth compile_macros(v, value)
+       redef fun value(ga) do return "{ga.color(_elements.first)} /* Group of ? */"
+       redef fun compile_macros(v, value)

        do
                var i = 0
                for e in _elements do
        do
                var i = 0
                for e in _elements do

@@ -577,7 +577,7 @@ end
 # An element that represents a class property
 abstract class TableEltProp
 special TableElt
 # An element that represents a class property
 abstract class TableEltProp
 special TableElt

-       attr _property: MMLocalProperty
+       var _property: MMLocalProperty

 
        init(p: MMLocalProperty)
        do
 
        init(p: MMLocalProperty)
        do

@@ -588,13 +588,13 @@ end
 # An element that represents a function pointer to a global method
 class TableEltMeth
 special TableEltProp
 # An element that represents a function pointer to a global method
 class TableEltMeth
 special TableEltProp

-       redef meth compile_macros(v, value)
+       redef fun compile_macros(v, value)

        do
                var pg = _property.global
                v.add_decl("#define {pg.meth_call}(recv) (({pg.intro.cname}_t)CALL((recv), ({value})))")
        end
 
        do
                var pg = _property.global
                v.add_decl("#define {pg.meth_call}(recv) (({pg.intro.cname}_t)CALL((recv), ({value})))")
        end
 

-       redef meth compile_to_c(v, c)
+       redef fun compile_to_c(v, c)

        do
                var p = c[_property.global]
                return p.cname
        do
                var p = c[_property.global]
                return p.cname

@@ -604,13 +604,13 @@ end
 # An element that represents a function pointer to the super method of a local method
 class TableEltSuper
 special TableEltProp
 # An element that represents a function pointer to the super method of a local method
 class TableEltSuper
 special TableEltProp

-       redef meth compile_macros(v, value)
+       redef fun compile_macros(v, value)

        do
                var p = _property
                v.add_decl("#define {p.super_meth_call}(recv) (({p.cname}_t)CALL((recv), ({value})))")
        end
 
        do
                var p = _property
                v.add_decl("#define {p.super_meth_call}(recv) (({p.cname}_t)CALL((recv), ({value})))")
        end
 

-       redef meth compile_to_c(v, c)
+       redef fun compile_to_c(v, c)

        do
                var pc = _property.local_class
                var g = _property.global
        do
                var pc = _property.local_class
                var g = _property.global

@@ -634,13 +634,13 @@ end
 # An element that represents the value stored for a global attribute
 class TableEltAttr
 special TableEltProp
 # An element that represents the value stored for a global attribute
 class TableEltAttr
 special TableEltProp

-       redef meth compile_macros(v, value)
+       redef fun compile_macros(v, value)

        do
                var pg = _property.global
                v.add_decl("#define {pg.attr_access}(recv) ATTR(recv, ({value}))")
        end
 
        do
                var pg = _property.global
                v.add_decl("#define {pg.attr_access}(recv) ATTR(recv, ({value}))")
        end
 

-       redef meth compile_to_c(v, c)
+       redef fun compile_to_c(v, c)

        do
                var ga = v.global_analysis
                var p = c[_property.global]
        do
                var ga = v.global_analysis
                var p = c[_property.global]

@@ -652,7 +652,7 @@ end
 class AbsTableEltClass
 special AbsTableElt
        # The local class where the information comes from
 class AbsTableEltClass
 special AbsTableElt
        # The local class where the information comes from

-       attr _local_class: MMLocalClass
+       var _local_class: MMLocalClass

 
        init(c: MMLocalClass)
        do
 
        init(c: MMLocalClass)
        do

@@ -660,9 +660,9 @@ special AbsTableElt
        end
 
        # The C macro name refering the value
        end
 
        # The C macro name refering the value

-       meth symbol: String is abstract
+       fun symbol: String is abstract

 
 

-       redef meth compile_macros(v, value)
+       redef fun compile_macros(v, value)

        do
                v.add_decl("#define {symbol} ({value})")
        end
        do
                v.add_decl("#define {symbol} ({value})")
        end

@@ -672,7 +672,7 @@ end
 class TableEltClass
 special TableElt
 special AbsTableEltClass
 class TableEltClass
 special TableElt
 special AbsTableEltClass

-       redef meth is_related_to(c)
+       redef fun is_related_to(c)

        do
                var bc = c.module[_local_class.global]
                return c.cshe <= bc
        do
                var bc = c.module[_local_class.global]
                return c.cshe <= bc

@@ -683,9 +683,9 @@ end
 class TableEltClassId
 special ModuleTableElt
 special AbsTableEltClass
 class TableEltClassId
 special ModuleTableElt
 special AbsTableEltClass

-       redef meth symbol do return _local_class.global.id_id
+       redef fun symbol do return _local_class.global.id_id

 
 

-       redef meth value(ga)
+       redef fun value(ga)

        do
                return "{ga.compiled_classes[_local_class.global].id} /* Id of {_local_class} */"
        end
        do
                return "{ga.compiled_classes[_local_class.global].id} /* Id of {_local_class} */"
        end

@@ -694,9 +694,9 @@ end
 # An element representing the constructor marker position in a class table
 class TableEltClassInitTable
 special TableEltClass
 # An element representing the constructor marker position in a class table
 class TableEltClassInitTable
 special TableEltClass

-       redef meth symbol do return _local_class.global.init_table_pos_id
+       redef fun symbol do return _local_class.global.init_table_pos_id

 
 

-       redef meth compile_to_c(v, c)
+       redef fun compile_to_c(v, c)

        do
                var ga = v.global_analysis
                var cc = ga.compiled_classes[_local_class.global]
        do
                var ga = v.global_analysis
                var cc = ga.compiled_classes[_local_class.global]

@@ -716,14 +716,14 @@ end
 class TableEltClassColor
 special TableEltClass
 special ModuleTableElt
 class TableEltClassColor
 special TableEltClass
 special ModuleTableElt

-       redef meth symbol do return _local_class.global.color_id
+       redef fun symbol do return _local_class.global.color_id

 
 

-       redef meth value(ga)
+       redef fun value(ga)

        do
                return "{ga.color(self)} /* Color of {_local_class} */"
        end
 
        do
                return "{ga.color(self)} /* Color of {_local_class} */"
        end
 

-       redef meth compile_to_c(v, c)
+       redef fun compile_to_c(v, c)

        do
                var ga = v.global_analysis
                var cc = ga.compiled_classes[_local_class.global]
        do
                var ga = v.global_analysis
                var cc = ga.compiled_classes[_local_class.global]

@@ -734,21 +734,21 @@ end
 # A Group of elements introduced in the same global-class that are colored together
 class TableEltComposite
 special TableElt
 # A Group of elements introduced in the same global-class that are colored together
 class TableEltComposite
 special TableElt

-       attr _table: Array[TableElt]
-       attr _cc: CompiledClass
-       attr _offsets: HashMap[MMLocalClass, Int]
-       redef meth length do return _table.length
-       redef meth is_related_to(c) do return c.cshe <= _cc.local_class
+       var _table: Array[TableElt]
+       var _cc: CompiledClass
+       var _offsets: HashMap[MMLocalClass, Int]
+       redef fun length do return _table.length
+       redef fun is_related_to(c) do return c.cshe <= _cc.local_class

 
 

-       meth add(c: MMLocalClass, tab: Array[TableElt])
+       fun add(c: MMLocalClass, tab: Array[TableElt])

        do
                _offsets[c] = _table.length
                _table.append(tab)
        end
 
        do
                _offsets[c] = _table.length
                _table.append(tab)
        end
 

-       redef meth item(i) do return _table[i]
+       redef fun item(i) do return _table[i]

 
 

-       redef meth compile_to_c(v, c) do abort
+       redef fun compile_to_c(v, c) do abort

 
        init(cc: CompiledClass)
        do
 
        init(cc: CompiledClass)
        do

@@ -761,8 +761,8 @@ end
 # The element that represent the class id
 class TableEltClassSelfId
 special TableElt
 # The element that represent the class id
 class TableEltClassSelfId
 special TableElt

-       redef meth is_related_to(c) do return true
-       redef meth compile_to_c(v, c)
+       redef fun is_related_to(c) do return true
+       redef fun compile_to_c(v, c)

        do
                var ga = v.global_analysis
                return "{v.global_analysis.compiled_classes[c.global].id} /* {ga.color(self)}: Identity */"
        do
                var ga = v.global_analysis
                return "{v.global_analysis.compiled_classes[c.global].id} /* {ga.color(self)}: Identity */"

@@ -772,8 +772,8 @@ end
 # The element that
 class TableEltVftPointer
 special TableElt
 # The element that
 class TableEltVftPointer
 special TableElt

-       redef meth is_related_to(c) do return true
-       redef meth compile_to_c(v, c)
+       redef fun is_related_to(c) do return true
+       redef fun compile_to_c(v, c)

        do
                var ga = v.global_analysis
                return "/* {ga.color(self)}: Pointer to the classtable */"
        do
                var ga = v.global_analysis
                return "/* {ga.color(self)}: Pointer to the classtable */"

@@ -786,13 +786,13 @@ end
 # The total order superset the class refinement and the class specialisation relations
 class ClassSorter
 special AbstractSorter[MMLocalClass]
 # The total order superset the class refinement and the class specialisation relations
 class ClassSorter
 special AbstractSorter[MMLocalClass]

-       redef meth compare(a, b) do return a.compare(b)
+       redef fun compare(a, b) do return a.compare(b)

        init do end
 end
 
 redef class MMLocalClass
        # Comparaison in a total order that superset the class refinement and the class specialisation relations
        init do end
 end
 
 redef class MMLocalClass
        # Comparaison in a total order that superset the class refinement and the class specialisation relations

-       meth compare(b: MMLocalClass): Int
+       fun compare(b: MMLocalClass): Int

        do
                var a = self
                if a == b then
        do
                var a = self
                if a == b then

@@ -814,7 +814,7 @@ redef class MMLocalClass
        end
 
        # Declaration and macros related to the class table
        end
 
        # Declaration and macros related to the class table

-       meth declare_tables_to_c(v: GlobalCompilerVisitor)
+       fun declare_tables_to_c(v: GlobalCompilerVisitor)

        do
                v.add_decl("")
                var pi = primitive_info
        do
                v.add_decl("")
                var pi = primitive_info

@@ -831,7 +831,7 @@ redef class MMLocalClass
        end
 
        # Compilation of table and new (or box)
        end
 
        # Compilation of table and new (or box)

-       meth compile_tables_to_c(v: GlobalCompilerVisitor)
+       fun compile_tables_to_c(v: GlobalCompilerVisitor)

        do
                var cc = v.global_analysis.compiled_classes[self.global]
                var ctab = cc.class_table
        do
                var cc = v.global_analysis.compiled_classes[self.global]
                var ctab = cc.class_table

diff --git a/src/compiling/compiling_methods.nit b/src/compiling/compiling_methods.nit
index badeaa4..ef6f9e1 100644 (file)
--- a/src/compiling/compiling_methods.nit
+++ b/src/compiling/compiling_methods.nit
@@ -22,7 +22,7 @@ private import syntax
 
 redef class CompilerVisitor
        # Compile a statment node
 
 redef class CompilerVisitor
        # Compile a statment node

-       meth compile_stmt(n: nullable PExpr)
+       fun compile_stmt(n: nullable PExpr)

        do
                if n == null then return
                #add_instr("/* Compile stmt {n.locate} */")
        do
                if n == null then return
                #add_instr("/* Compile stmt {n.locate} */")

@@ -33,7 +33,7 @@ redef class CompilerVisitor
        end
 
        # Compile is expression node
        end
 
        # Compile is expression node

-       meth compile_expr(n: PExpr): String
+       fun compile_expr(n: PExpr): String

        do
                #add_instr("/* Compile expr {n.locate} */")
                var i = cfc._variable_index
        do
                #add_instr("/* Compile expr {n.locate} */")
                var i = cfc._variable_index

@@ -48,7 +48,7 @@ redef class CompilerVisitor
        end
 
        # Ensure that a c expression is a var
        end
 
        # Ensure that a c expression is a var

-       meth ensure_var(s: String, comment: String): String
+       fun ensure_var(s: String, comment: String): String

        do
                if cfc.is_valid_variable(s) then
                        add_instr("/* Ensure var {s}: {comment}*/")
        do
                if cfc.is_valid_variable(s) then
                        add_instr("/* Ensure var {s}: {comment}*/")

@@ -60,22 +60,22 @@ redef class CompilerVisitor
        end
 
        # Add a assignment between a variable and an expression
        end
 
        # Add a assignment between a variable and an expression

-       meth add_assignment(v: String, s: String)
+       fun add_assignment(v: String, s: String)

        do
                if v != s then
                        add_instr("{v} = {s};")
                end
        end
 
        do
                if v != s then
                        add_instr("{v} = {s};")
                end
        end
 

-       readable writable attr _cfc: nullable CFunctionContext
+       readable writable var _cfc: nullable CFunctionContext

 
 

-       readable writable attr _nmc: nullable NitMethodContext
+       readable writable var _nmc: nullable NitMethodContext

 
        # C outputs written outside the current C function.
 
        # C outputs written outside the current C function.

-       readable writable attr _out_contexts: Array[CContext] = new Array[CContext]
+       readable writable var _out_contexts: Array[CContext] = new Array[CContext]

 
        # Generate an fprintf to display an error location
 
        # Generate an fprintf to display an error location

-       meth printf_locate_error(node: PNode): String
+       fun printf_locate_error(node: PNode): String

        do
                var s = new Buffer.from("fprintf(stderr, \"")
                if nmc != null then s.append(" in %s")
        do
                var s = new Buffer.from("fprintf(stderr, \"")
                if nmc != null then s.append(" in %s")

@@ -85,7 +85,7 @@ redef class CompilerVisitor
                return s.to_s
        end
 
                return s.to_s
        end
 

-       meth invoke_super_init_calls_after(start_prop: nullable MMMethod)
+       fun invoke_super_init_calls_after(start_prop: nullable MMMethod)

        do
                var n = nmc.method.node
                assert n isa AConcreteInitPropdef
        do
                var n = nmc.method.node
                assert n isa AConcreteInitPropdef

@@ -140,22 +140,22 @@ end
 
 # A C function currently written
 class CFunctionContext
 
 # A C function currently written
 class CFunctionContext

-       readable attr _visitor: CompilerVisitor
+       readable var _visitor: CompilerVisitor

 
        # Next available variable number
 
        # Next available variable number

-       attr _variable_index: Int = 0
+       var _variable_index: Int = 0

 
        # Total number of variable
 
        # Total number of variable

-       attr _variable_index_max: Int = 0
+       var _variable_index_max: Int = 0

 
        # Association between nit variable and the corrsponding c variable index
 
        # Association between nit variable and the corrsponding c variable index

-       attr _varindexes: Map[Variable, Int] = new HashMap[Variable, Int]
+       var _varindexes: Map[Variable, Int] = new HashMap[Variable, Int]

 
        # Are we currenlty in a closure definition?
 
        # Are we currenlty in a closure definition?

-       readable writable attr _closure: nullable NitMethodContext = null
+       readable writable var _closure: nullable NitMethodContext = null

 
        # Return the cvariable of a Nit variable
 
        # Return the cvariable of a Nit variable

-       meth varname(v: Variable): String
+       fun varname(v: Variable): String

        do
                if v isa ClosureVariable then
                        return closure_variable(_varindexes[v])
        do
                if v isa ClosureVariable then
                        return closure_variable(_varindexes[v])

@@ -165,7 +165,7 @@ class CFunctionContext
        end
 
        # Return the next available variable
        end
 
        # Return the next available variable

-       meth get_var(comment: nullable String): String
+       fun get_var(comment: nullable String): String

        do
                var v = variable(_variable_index)
                _variable_index = _variable_index + 1
        do
                var v = variable(_variable_index)
                _variable_index = _variable_index + 1

@@ -178,7 +178,7 @@ class CFunctionContext
                return v
        end
 
                return v
        end
 

-       meth register_variable(v: Variable): String
+       fun register_variable(v: Variable): String

        do
                _varindexes[v] = _variable_index
                var s = get_var("Local variable")
        do
                _varindexes[v] = _variable_index
                var s = get_var("Local variable")

@@ -186,9 +186,9 @@ class CFunctionContext
        end
 
        # Next available closure variable number
        end
 
        # Next available closure variable number

-       attr _closurevariable_index: Int = 0
+       var _closurevariable_index: Int = 0

 
 

-       meth register_closurevariable(v: ClosureVariable): String
+       fun register_closurevariable(v: ClosureVariable): String

        do
                var s = "closurevariable[{_closurevariable_index}]"
                _varindexes[v] = _closurevariable_index
        do
                var s = "closurevariable[{_closurevariable_index}]"
                _varindexes[v] = _closurevariable_index

@@ -201,7 +201,7 @@ class CFunctionContext
        end
 
        # Return the ith cvariable
        end
 
        # Return the ith cvariable

-       protected meth variable(i: Int): String
+       protected fun variable(i: Int): String

        do
                if closure != null then
                        var vn = once new Array[String]
        do
                if closure != null then
                        var vn = once new Array[String]

@@ -223,7 +223,7 @@ class CFunctionContext
        end
 
        # Return the ith closurevariable
        end
 
        # Return the ith closurevariable

-       protected meth closure_variable(i: Int): String
+       protected fun closure_variable(i: Int): String

        do
                if closure != null then
                        return "(closctx->closurevariable[{i}])"
        do
                if closure != null then
                        return "(closctx->closurevariable[{i}])"

@@ -233,7 +233,7 @@ class CFunctionContext
        end
 
        # Is s a valid variable
        end
 
        # Is s a valid variable

-       protected meth is_valid_variable(s: String): Bool
+       protected fun is_valid_variable(s: String): Bool

        do
                for i in [0.._variable_index[ do
                        if s == variable(i) then return true
        do
                for i in [0.._variable_index[ do
                        if s == variable(i) then return true

@@ -242,7 +242,7 @@ class CFunctionContext
        end
 
        # Mark the variable available
        end
 
        # Mark the variable available

-       meth free_var(v: String)
+       fun free_var(v: String)

        do
                # FIXME: So ugly..
                if v == variable(_variable_index-1) then
        do
                # FIXME: So ugly..
                if v == variable(_variable_index-1) then

@@ -252,7 +252,7 @@ class CFunctionContext
 
        # Generate the local variable declarations
        # To use at the end of the C function once all variables are known
 
        # Generate the local variable declarations
        # To use at the end of the C function once all variables are known

-       meth generate_var_decls
+       fun generate_var_decls

        do
                if _variable_index_max > 0 then
                        visitor.add_decl("val_t variable[{_variable_index_max}];")
        do
                if _variable_index_max > 0 then
                        visitor.add_decl("val_t variable[{_variable_index_max}];")

@@ -272,28 +272,28 @@ end
 # A Nit method currenlty compiled
 class NitMethodContext
        # Current method compiled
 # A Nit method currenlty compiled
 class NitMethodContext
        # Current method compiled

-       readable attr _method: nullable MMSrcMethod
+       readable var _method: nullable MMSrcMethod

 
        # Association between parameters and the corresponding variables
 
        # Association between parameters and the corresponding variables

-       readable writable attr _method_params: nullable Array[ParamVariable]
+       readable writable var _method_params: nullable Array[ParamVariable]

 
        # Where a nit return must branch
 
        # Where a nit return must branch

-       readable writable attr _return_label: nullable String
+       readable writable var _return_label: nullable String

 
        # Where a nit break must branch
 
        # Where a nit break must branch

-       readable writable attr _break_label: nullable String
+       readable writable var _break_label: nullable String

 
        # Where a nit continue must branch
 
        # Where a nit continue must branch

-       readable writable attr _continue_label: nullable String
+       readable writable var _continue_label: nullable String

 
        # Variable where a functionnal nit return must store its value
 
        # Variable where a functionnal nit return must store its value

-       readable writable attr _return_value: nullable String
+       readable writable var _return_value: nullable String

 
        # Variable where a functionnal nit break must store its value
 
        # Variable where a functionnal nit break must store its value

-       readable writable attr _break_value: nullable String
+       readable writable var _break_value: nullable String

 
        # Variable where a functionnal nit continue must store its value
 
        # Variable where a functionnal nit continue must store its value

-       readable writable attr _continue_value: nullable String
+       readable writable var _continue_value: nullable String

 
        init(method: nullable MMSrcMethod)
        do
 
        init(method: nullable MMSrcMethod)
        do

@@ -304,13 +304,13 @@ end
 ###############################################################################
 
 redef class ClosureVariable
 ###############################################################################
 
 redef class ClosureVariable

-       readable writable attr _ctypename: nullable String
+       readable writable var _ctypename: nullable String

 end
 
 redef class MMMethod
        # Compile as an expression.
        # require that signature.return_type != null
 end
 
 redef class MMMethod
        # Compile as an expression.
        # require that signature.return_type != null

-       meth compile_expr_call(v: CompilerVisitor, cargs: Array[String]): String
+       fun compile_expr_call(v: CompilerVisitor, cargs: Array[String]): String

        do
                assert signature.return_type != null
                var s = intern_compile_call(v, cargs)
        do
                assert signature.return_type != null
                var s = intern_compile_call(v, cargs)

@@ -320,7 +320,7 @@ redef class MMMethod
 
        # Compile as a statement.
        # require that signature.return_type == null
 
        # Compile as a statement.
        # require that signature.return_type == null

-       meth compile_stmt_call(v: CompilerVisitor, cargs: Array[String])
+       fun compile_stmt_call(v: CompilerVisitor, cargs: Array[String])

        do
                assert signature.return_type == null
                var s = intern_compile_call(v, cargs)
        do
                assert signature.return_type == null
                var s = intern_compile_call(v, cargs)

@@ -331,7 +331,7 @@ redef class MMMethod
        # Most calls are compiled with a table access,
        # primitive calles are inlined
        # == and != are guarded and possibly inlined
        # Most calls are compiled with a table access,
        # primitive calles are inlined
        # == and != are guarded and possibly inlined

-       private meth intern_compile_call(v: CompilerVisitor, cargs: Array[String]): nullable String
+       private fun intern_compile_call(v: CompilerVisitor, cargs: Array[String]): nullable String

        do
                var i = self
                if i isa MMSrcMethod then
        do
                var i = self
                if i isa MMSrcMethod then

@@ -373,7 +373,7 @@ redef class MMMethod
        end
 
        # Compile a call on self for given arguments and given closures
        end
 
        # Compile a call on self for given arguments and given closures

-       meth compile_call_and_closures(v: CompilerVisitor, cargs: Array[String], clos_defs: nullable Array[PClosureDef]): nullable String
+       fun compile_call_and_closures(v: CompilerVisitor, cargs: Array[String], clos_defs: nullable Array[PClosureDef]): nullable String

        do
                var ve: String
                var arity = 0
        do
                var ve: String
                var arity = 0

@@ -433,13 +433,13 @@ redef class MMMethod
        end
 
        # Compile a call as constructor with given args
        end
 
        # Compile a call as constructor with given args

-       meth compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String
+       fun compile_constructor_call(v: CompilerVisitor, recvtype: MMType, cargs: Array[String]): String

        do
                return "NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}) /*new {recvtype}*/"
        end
 
        # Compile a call as call-next-method on self with given args
        do
                return "NEW_{recvtype.local_class}_{global.intro.cname}({cargs.join(", ")}) /*new {recvtype}*/"
        end
 
        # Compile a call as call-next-method on self with given args

-       meth compile_super_call(v: CompilerVisitor, cargs: Array[String]): String
+       fun compile_super_call(v: CompilerVisitor, cargs: Array[String]): String

        do
                var m = "{super_meth_call}({cargs[0]})"
                var vcall = "{m}({cargs.join(", ")}) /*super {local_class}::{name}*/"
        do
                var m = "{super_meth_call}({cargs[0]})"
                var vcall = "{m}({cargs.join(", ")}) /*super {local_class}::{name}*/"

@@ -447,7 +447,7 @@ redef class MMMethod
        end
 
        # Cname of the i-th closure C struct type
        end
 
        # Cname of the i-th closure C struct type

-       protected meth closure_cname(i: Int): String
+       protected fun closure_cname(i: Int): String

        do
                return "FWBT_{cname}_{i}"
        end
        do
                return "FWBT_{cname}_{i}"
        end

@@ -455,13 +455,13 @@ end
 
 redef class MMAttribute
        # Compile a read acces on selffor a given reciever.
 
 redef class MMAttribute
        # Compile a read acces on selffor a given reciever.

-       meth compile_isset(v: CompilerVisitor, n: PNode, recv: String): String
+       fun compile_isset(v: CompilerVisitor, n: PNode, recv: String): String

        do
                return "TAG_Bool({global.attr_access}({recv})!=NIT_NULL) /* isset {local_class}::{name}*/"
        end
 
        # Compile a read acces on selffor a given reciever.
        do
                return "TAG_Bool({global.attr_access}({recv})!=NIT_NULL) /* isset {local_class}::{name}*/"
        end
 
        # Compile a read acces on selffor a given reciever.

-       meth compile_read_access(v: CompilerVisitor, n: PNode, recv: String): String
+       fun compile_read_access(v: CompilerVisitor, n: PNode, recv: String): String

        do
                var res = "{global.attr_access}({recv}) /*{local_class}::{name}*/"
                if not signature.return_type.is_nullable then
        do
                var res = "{global.attr_access}({recv}) /*{local_class}::{name}*/"
                if not signature.return_type.is_nullable then

@@ -472,7 +472,7 @@ redef class MMAttribute
        end
 
        # Compile a write acces on selffor a given reciever.
        end
 
        # Compile a write acces on selffor a given reciever.

-       meth compile_write_access(v: CompilerVisitor, n: nullable PNode, recv: String, value: String)
+       fun compile_write_access(v: CompilerVisitor, n: nullable PNode, recv: String, value: String)

        do
                v.add_instr("{global.attr_access}({recv}) /*{local_class}::{name}*/ = {value};")
        end
        do
                v.add_instr("{global.attr_access}({recv}) /*{local_class}::{name}*/ = {value};")
        end

@@ -480,13 +480,13 @@ end
 
 redef class MMLocalProperty
        # Compile the property as a C property
 
 redef class MMLocalProperty
        # Compile the property as a C property

-       meth compile_property_to_c(v: CompilerVisitor) do end
+       fun compile_property_to_c(v: CompilerVisitor) do end

 end
 
 redef class MMSrcMethod
 
        # Compile and declare the signature to C
 end
 
 redef class MMSrcMethod
 
        # Compile and declare the signature to C

-       protected meth decl_csignature(v: CompilerVisitor, args: Array[String]): String
+       protected fun decl_csignature(v: CompilerVisitor, args: Array[String]): String

        do
                var params = new Array[String]
                params.add("val_t {args[0]}")
        do
                var params = new Array[String]
                params.add("val_t {args[0]}")

@@ -529,7 +529,7 @@ redef class MMSrcMethod
                return s
        end
 
                return s
        end
 

-       redef meth compile_property_to_c(v)
+       redef fun compile_property_to_c(v)

        do
                v.cfc = new CFunctionContext(v)
 
        do
                v.cfc = new CFunctionContext(v)
 

@@ -576,18 +576,18 @@ redef class MMSrcMethod
        end
 
        # Compile the method body inline
        end
 
        # Compile the method body inline

-       meth do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract
+       fun do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract

 end
 
 redef class MMReadImplementationMethod
 end
 
 redef class MMReadImplementationMethod

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                return node.prop.compile_read_access(v, node, params[0])
        end
 end
 
 redef class MMWriteImplementationMethod
        do
                return node.prop.compile_read_access(v, node, params[0])
        end
 end
 
 redef class MMWriteImplementationMethod

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                node.prop.compile_write_access(v, node, params[0], params[1])
                return null
        do
                node.prop.compile_write_access(v, node, params[0], params[1])
                return null

@@ -595,14 +595,14 @@ redef class MMWriteImplementationMethod
 end
 
 redef class MMMethSrcMethod
 end
 
 redef class MMMethSrcMethod

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                return node.do_compile_inside(v, self, params)
        end
 end
 
 redef class MMImplicitInit
        do
                return node.do_compile_inside(v, self, params)
        end
 end
 
 redef class MMImplicitInit

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                var f = params.length - unassigned_attributes.length
                var recv = params.first
        do
                var f = params.length - unassigned_attributes.length
                var recv = params.first

@@ -631,7 +631,7 @@ end
 redef class MMType
        # Compile a subtype check to self
        # Return a NIT Bool
 redef class MMType
        # Compile a subtype check to self
        # Return a NIT Bool

-       meth compile_cast(v: CompilerVisitor, recv: String, fromtype: MMType): String
+       fun compile_cast(v: CompilerVisitor, recv: String, fromtype: MMType): String

        do
                # Fixme: handle formaltypes
                var g = local_class.global
        do
                # Fixme: handle formaltypes
                var g = local_class.global

@@ -650,7 +650,7 @@ redef class MMType
        end
 
        # Compile a cast assertion
        end
 
        # Compile a cast assertion

-       meth compile_type_check(v: CompilerVisitor, recv: String, n: PNode, fromtype: MMType)
+       fun compile_type_check(v: CompilerVisitor, recv: String, n: PNode, fromtype: MMType)

        do
                # Fixme: handle formaltypes
                var g = local_class.global
        do
                # Fixme: handle formaltypes
                var g = local_class.global

@@ -669,7 +669,7 @@ redef class MMType
        end
 
        # Compile a notnull cast assertion
        end
 
        # Compile a notnull cast assertion

-       meth compile_notnull_check(v: CompilerVisitor, recv: String, n: PNode)
+       fun compile_notnull_check(v: CompilerVisitor, recv: String, n: PNode)

        do
                if is_nullable then
                        v.add_instr("if (({recv}==NIT_NULL)) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;")
        do
                if is_nullable then
                        v.add_instr("if (({recv}==NIT_NULL)) \{ fprintf(stderr, \"Cast failled\"); {v.printf_locate_error(n)} nit_exit(1); } /*cast {self}*/;")

@@ -681,15 +681,15 @@ end
 
 redef class AMethPropdef
        # Compile the method body
 
 redef class AMethPropdef
        # Compile the method body

-       meth do_compile_inside(v: CompilerVisitor, method: MMSrcMethod, params: Array[String]): nullable String is abstract
+       fun do_compile_inside(v: CompilerVisitor, method: MMSrcMethod, params: Array[String]): nullable String is abstract

 end
 
 redef class PSignature
 end
 
 redef class PSignature

-       meth compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String]) is abstract
+       fun compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String]) is abstract

 end
 
 redef class ASignature
 end
 
 redef class ASignature

-       redef meth compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String])
+       redef fun compile_parameters(v: CompilerVisitor, orig_sig: MMSignature, params: Array[String])

        do
                for ap in n_params do
                        var cname = v.cfc.register_variable(ap.variable)
        do
                for ap in n_params do
                        var cname = v.cfc.register_variable(ap.variable)

@@ -713,7 +713,7 @@ redef class ASignature
 end
 
 redef class AConcreteMethPropdef
 end
 
 redef class AConcreteMethPropdef

-       redef meth do_compile_inside(v, method, params)
+       redef fun do_compile_inside(v, method, params)

        do
                var old_nmc = v.nmc
                v.nmc = new NitMethodContext(method)
        do
                var old_nmc = v.nmc
                v.nmc = new NitMethodContext(method)

@@ -758,7 +758,7 @@ redef class AConcreteMethPropdef
 end
 
 redef class ADeferredMethPropdef
 end
 
 redef class ADeferredMethPropdef

-       redef meth do_compile_inside(v, method, params)
+       redef fun do_compile_inside(v, method, params)

        do
                v.add_instr("fprintf(stderr, \"Deferred method called\");")
                v.add_instr(v.printf_locate_error(self))
        do
                v.add_instr("fprintf(stderr, \"Deferred method called\");")
                v.add_instr(v.printf_locate_error(self))

@@ -772,7 +772,7 @@ redef class ADeferredMethPropdef
 end
 
 redef class AExternMethPropdef
 end
 
 redef class AExternMethPropdef

-       redef meth do_compile_inside(v, method, params)
+       redef fun do_compile_inside(v, method, params)

        do
                var ename = "{method.module.name}_{method.local_class.name}_{method.local_class.name}_{method.name}_{method.signature.arity}"
                if n_extern != null then
        do
                var ename = "{method.module.name}_{method.local_class.name}_{method.local_class.name}_{method.name}_{method.signature.arity}"
                if n_extern != null then

@@ -799,7 +799,7 @@ redef class AExternMethPropdef
 end
 
 redef class AInternMethPropdef
 end
 
 redef class AInternMethPropdef

-       redef meth do_compile_inside(v, method, p)
+       redef fun do_compile_inside(v, method, p)

        do
                var c = method.local_class.name
                var n = method.name
        do
                var c = method.local_class.name
                var n = method.name

@@ -976,20 +976,20 @@ end
 redef class PExpr
        # Compile the node as an expression
        # Only the visitor should call it
 redef class PExpr
        # Compile the node as an expression
        # Only the visitor should call it

-       meth compile_expr(v: CompilerVisitor): String is abstract
+       fun compile_expr(v: CompilerVisitor): String is abstract

 
        # Prepare a call of node as a statement
        # Only the visitor should call it
        # It's used for local variable managment
 
        # Prepare a call of node as a statement
        # Only the visitor should call it
        # It's used for local variable managment

-       meth prepare_compile_stmt(v: CompilerVisitor) do end
+       fun prepare_compile_stmt(v: CompilerVisitor) do end

 
        # Compile the node as a statement
        # Only the visitor should call it
 
        # Compile the node as a statement
        # Only the visitor should call it

-       meth compile_stmt(v: CompilerVisitor) do printl("Error!")
+       fun compile_stmt(v: CompilerVisitor) do printl("Error!")

 end
 
 redef class ABlockExpr
 end
 
 redef class ABlockExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                for n in n_expr do
                        v.compile_stmt(n)
        do
                for n in n_expr do
                        v.compile_stmt(n)

@@ -998,12 +998,12 @@ redef class ABlockExpr
 end
 
 redef class AVardeclExpr
 end
 
 redef class AVardeclExpr

-       redef meth prepare_compile_stmt(v)
+       redef fun prepare_compile_stmt(v)

        do
                v.cfc.register_variable(variable)
        end
 
        do
                v.cfc.register_variable(variable)
        end
 

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var cname = v.cfc.varname(variable)
                if n_expr == null then
        do
                var cname = v.cfc.varname(variable)
                if n_expr == null then

@@ -1016,7 +1016,7 @@ redef class AVardeclExpr
 end
 
 redef class AReturnExpr
 end
 
 redef class AReturnExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))
        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))

@@ -1028,7 +1028,7 @@ redef class AReturnExpr
 end
 
 redef class ABreakExpr
 end
 
 redef class ABreakExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))
        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))

@@ -1040,7 +1040,7 @@ redef class ABreakExpr
 end
 
 redef class AContinueExpr
 end
 
 redef class AContinueExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))
        do
                if n_expr != null then
                        var e = v.compile_expr(n_expr.as(not null))

@@ -1051,21 +1051,21 @@ redef class AContinueExpr
 end
 
 redef class AAbortExpr
 end
 
 redef class AAbortExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                v.add_instr("fprintf(stderr, \"Aborted\"); {v.printf_locate_error(self)} nit_exit(1);")
        end
 end
 
 redef class ADoExpr
        do
                v.add_instr("fprintf(stderr, \"Aborted\"); {v.printf_locate_error(self)} nit_exit(1);")
        end
 end
 
 redef class ADoExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                v.compile_stmt(n_block)
        end
 end
 
 redef class AIfExpr
        do
                v.compile_stmt(n_block)
        end
 end
 
 redef class AIfExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = v.compile_expr(n_expr)
                v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/")
        do
                var e = v.compile_expr(n_expr)
                v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/")

@@ -1086,7 +1086,7 @@ redef class AIfExpr
 end
 
 redef class AIfexprExpr
 end
 
 redef class AIfexprExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/")
        do
                var e = v.compile_expr(n_expr)
                v.add_instr("if (UNTAG_Bool({e})) \{ /*if*/")

@@ -1107,8 +1107,8 @@ end
 
 class AControlableBlock
 special PExpr
 
 class AControlableBlock
 special PExpr

-       meth compile_inside_block(v: CompilerVisitor) is abstract
-       redef meth compile_stmt(v)
+       fun compile_inside_block(v: CompilerVisitor) is abstract
+       redef fun compile_stmt(v)

        do
                var old_break_label = v.nmc.break_label
                var old_continue_label = v.nmc.continue_label
        do
                var old_break_label = v.nmc.break_label
                var old_continue_label = v.nmc.continue_label

@@ -1126,7 +1126,7 @@ end
 
 redef class AWhileExpr
 special AControlableBlock
 
 redef class AWhileExpr
 special AControlableBlock

-       redef meth compile_inside_block(v)
+       redef fun compile_inside_block(v)

        do
                v.add_instr("while (true) \{ /*while*/")
                v.indent
        do
                v.add_instr("while (true) \{ /*while*/")
                v.indent

@@ -1143,7 +1143,7 @@ end
 
 redef class AForExpr
 special AControlableBlock
 
 redef class AForExpr
 special AControlableBlock

-       redef meth compile_inside_block(v)
+       redef fun compile_inside_block(v)

        do
                var e = v.compile_expr(n_expr)
                var ittype = meth_iterator.signature.return_type
        do
                var e = v.compile_expr(n_expr)
                var ittype = meth_iterator.signature.return_type

@@ -1170,7 +1170,7 @@ special AControlableBlock
 end
 
 redef class AAssertExpr
 end
 
 redef class AAssertExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = v.compile_expr(n_expr)
                var s = ""
        do
                var e = v.compile_expr(n_expr)
                var s = ""

@@ -1182,14 +1182,14 @@ redef class AAssertExpr
 end
 
 redef class AVarExpr
 end
 
 redef class AVarExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " {v.cfc.varname(variable)} /*{variable.name}*/"
        end
 end
 
 redef class AVarAssignExpr
        do
                return " {v.cfc.varname(variable)} /*{variable.name}*/"
        end
 end
 
 redef class AVarAssignExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = v.compile_expr(n_value)
                v.add_assignment(v.cfc.varname(variable), "{e} /*{variable.name}=*/")
        do
                var e = v.compile_expr(n_value)
                v.add_assignment(v.cfc.varname(variable), "{e} /*{variable.name}=*/")

@@ -1197,7 +1197,7 @@ redef class AVarAssignExpr
 end
 
 redef class AVarReassignExpr
 end
 
 redef class AVarReassignExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e1 = v.cfc.varname(variable)
                var e2 = v.compile_expr(n_value)
        do
                var e1 = v.cfc.varname(variable)
                var e2 = v.compile_expr(n_value)

@@ -1207,14 +1207,14 @@ redef class AVarReassignExpr
 end
 
 redef class ASelfExpr
 end
 
 redef class ASelfExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return v.cfc.varname(v.nmc.method_params[0])
        end
 end
 
 redef class AOrExpr
        do
                return v.cfc.varname(v.nmc.method_params[0])
        end
 end
 
 redef class AOrExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.ensure_var(v.compile_expr(n_expr), "Left 'or' operand")
                v.add_instr("if (!UNTAG_Bool({e})) \{ /* or */")
        do
                var e = v.ensure_var(v.compile_expr(n_expr), "Left 'or' operand")
                v.add_instr("if (!UNTAG_Bool({e})) \{ /* or */")

@@ -1229,7 +1229,7 @@ redef class AOrExpr
 end
 
 redef class AAndExpr
 end
 
 redef class AAndExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.ensure_var(v.compile_expr(n_expr), "Left 'and' operand")
                v.add_instr("if (UNTAG_Bool({e})) \{ /* and */")
        do
                var e = v.ensure_var(v.compile_expr(n_expr), "Left 'and' operand")
                v.add_instr("if (UNTAG_Bool({e})) \{ /* and */")

@@ -1244,14 +1244,14 @@ redef class AAndExpr
 end
 
 redef class ANotExpr
 end
 
 redef class ANotExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " TAG_Bool(!UNTAG_Bool({v.compile_expr(n_expr)}))"
        end
 end
 
 redef class AEeExpr
        do
                return " TAG_Bool(!UNTAG_Bool({v.compile_expr(n_expr)}))"
        end
 end
 
 redef class AEeExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_expr2)
        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_expr2)

@@ -1260,7 +1260,7 @@ redef class AEeExpr
 end
 
 redef class AIsaExpr
 end
 
 redef class AIsaExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                return n_type.stype.compile_cast(v, e, n_expr.stype)
        do
                var e = v.compile_expr(n_expr)
                return n_type.stype.compile_cast(v, e, n_expr.stype)

@@ -1268,7 +1268,7 @@ redef class AIsaExpr
 end
 
 redef class AAsCastExpr
 end
 
 redef class AAsCastExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                n_type.stype.compile_type_check(v, e, self, n_expr.stype)
        do
                var e = v.compile_expr(n_expr)
                n_type.stype.compile_type_check(v, e, self, n_expr.stype)

@@ -1277,7 +1277,7 @@ redef class AAsCastExpr
 end
 
 redef class AAsNotnullExpr
 end
 
 redef class AAsNotnullExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                n_expr.stype.compile_notnull_check(v, e, self)
        do
                var e = v.compile_expr(n_expr)
                n_expr.stype.compile_notnull_check(v, e, self)

@@ -1286,42 +1286,42 @@ redef class AAsNotnullExpr
 end
 
 redef class ATrueExpr
 end
 
 redef class ATrueExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " TAG_Bool(true)"
        end
 end
 
 redef class AFalseExpr
        do
                return " TAG_Bool(true)"
        end
 end
 
 redef class AFalseExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " TAG_Bool(false)"
        end
 end
 
 redef class AIntExpr
        do
                return " TAG_Bool(false)"
        end
 end
 
 redef class AIntExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " TAG_Int({n_number.text})"
        end
 end
 
 redef class AFloatExpr
        do
                return " TAG_Int({n_number.text})"
        end
 end
 
 redef class AFloatExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return "BOX_Float({n_float.text})"
        end
 end
 
 redef class ACharExpr
        do
                return "BOX_Float({n_float.text})"
        end
 end
 
 redef class ACharExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " TAG_Char({n_char.text})"
        end
 end
 
 redef class AStringFormExpr
        do
                return " TAG_Char({n_char.text})"
        end
 end
 
 redef class AStringFormExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                compute_string_info
                var i = v.new_number
        do
                compute_string_info
                var i = v.new_number

@@ -1340,16 +1340,16 @@ redef class AStringFormExpr
        end
 
        # The raw string value
        end
 
        # The raw string value

-       protected meth string_text: String is abstract
+       protected fun string_text: String is abstract

 
        # The string in a C native format
 
        # The string in a C native format

-       protected attr _cstring: nullable String
+       protected var _cstring: nullable String

 
        # The string length in bytes
 
        # The string length in bytes

-       protected attr _cstring_length: nullable Int
+       protected var _cstring_length: nullable Int

 
        # Compute _cstring and _cstring_length using string_text
 
        # Compute _cstring and _cstring_length using string_text

-       protected meth compute_string_info
+       protected fun compute_string_info

        do
                var len = 0
                var str = string_text
        do
                var len = 0
                var str = string_text

@@ -1375,20 +1375,20 @@ redef class AStringFormExpr
 end
 
 redef class AStringExpr
 end
 
 redef class AStringExpr

-       redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2)
+       redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2)

 end
 redef class AStartStringExpr
 end
 redef class AStartStringExpr

-       redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2)
+       redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2)

 end
 redef class AMidStringExpr
 end
 redef class AMidStringExpr

-       redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2)
+       redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2)

 end
 redef class AEndStringExpr
 end
 redef class AEndStringExpr

-       redef meth string_text do return n_string.text.substring(1, n_string.text.length - 2)
+       redef fun string_text do return n_string.text.substring(1, n_string.text.length - 2)

 end
 
 redef class ASuperstringExpr
 end
 
 redef class ASuperstringExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var array = meth_with_capacity.compile_constructor_call(v, atype.as(not null), ["TAG_Int({n_exprs.length})"])
                array = v.ensure_var(array, "Array (for super-string)")
        do
                var array = meth_with_capacity.compile_constructor_call(v, atype.as(not null), ["TAG_Int({n_exprs.length})"])
                array = v.ensure_var(array, "Array (for super-string)")

@@ -1408,14 +1408,14 @@ redef class ASuperstringExpr
 end
 
 redef class ANullExpr
 end
 
 redef class ANullExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return " NIT_NULL /*null*/"
        end
 end
 
 redef class AArrayExpr
        do
                return " NIT_NULL /*null*/"
        end
 end
 
 redef class AArrayExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var recv = meth_with_capacity.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"])
                recv = v.ensure_var(recv, "Literal array")
        do
                var recv = meth_with_capacity.compile_constructor_call(v, stype, ["TAG_Int({n_exprs.length})"])
                recv = v.ensure_var(recv, "Literal array")

@@ -1429,7 +1429,7 @@ redef class AArrayExpr
 end
 
 redef class ARangeExpr
 end
 
 redef class ARangeExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_expr2)
        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_expr2)

@@ -1438,7 +1438,7 @@ redef class ARangeExpr
 end
 
 redef class ASuperExpr
 end
 
 redef class ASuperExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = intern_compile_call(v)
                if e != null then
        do
                var e = intern_compile_call(v)
                if e != null then

@@ -1446,14 +1446,14 @@ redef class ASuperExpr
                end
        end
 
                end
        end
 

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 
        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 

-       private meth intern_compile_call(v: CompilerVisitor): nullable String
+       private fun intern_compile_call(v: CompilerVisitor): nullable String

        do
                var arity = v.nmc.method_params.length - 1
                if init_in_superclass != null then
        do
                var arity = v.nmc.method_params.length - 1
                if init_in_superclass != null then

@@ -1481,7 +1481,7 @@ redef class ASuperExpr
 end
 
 redef class AAttrExpr
 end
 
 redef class AAttrExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                return prop.compile_read_access(v, n_id, e)
        do
                var e = v.compile_expr(n_expr)
                return prop.compile_read_access(v, n_id, e)

@@ -1489,7 +1489,7 @@ redef class AAttrExpr
 end
 
 redef class AAttrAssignExpr
 end
 
 redef class AAttrAssignExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_value)
        do
                var e = v.compile_expr(n_expr)
                var e2 = v.compile_expr(n_value)

@@ -1497,7 +1497,7 @@ redef class AAttrAssignExpr
        end
 end
 redef class AAttrReassignExpr
        end
 end
 redef class AAttrReassignExpr

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e1 = v.compile_expr(n_expr)
                var e2 = prop.compile_read_access(v, n_id, e1)
        do
                var e1 = v.compile_expr(n_expr)
                var e2 = prop.compile_read_access(v, n_id, e1)

@@ -1508,7 +1508,7 @@ redef class AAttrReassignExpr
 end
 
 redef class AIssetAttrExpr
 end
 
 redef class AIssetAttrExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = v.compile_expr(n_expr)
                return prop.compile_isset(v, n_id, e)
        do
                var e = v.compile_expr(n_expr)
                return prop.compile_isset(v, n_id, e)

@@ -1517,7 +1517,7 @@ end
 
 redef class AAbsAbsSendExpr
        # Compile each argument and add them to the array
 
 redef class AAbsAbsSendExpr
        # Compile each argument and add them to the array

-       meth compile_arguments_in(v: CompilerVisitor, cargs: Array[String])
+       fun compile_arguments_in(v: CompilerVisitor, cargs: Array[String])

        do
                for a in arguments.as(not null) do
                        cargs.add(v.compile_expr(a))
        do
                for a in arguments.as(not null) do
                        cargs.add(v.compile_expr(a))

@@ -1527,7 +1527,7 @@ redef class AAbsAbsSendExpr
 end
 
 redef class ASendExpr
 end
 
 redef class ASendExpr

-       private meth intern_compile_call(v: CompilerVisitor): nullable String
+       private fun intern_compile_call(v: CompilerVisitor): nullable String

        do
                var recv = v.compile_expr(n_expr)
                var cargs = new Array[String]
        do
                var recv = v.compile_expr(n_expr)
                var cargs = new Array[String]

@@ -1547,14 +1547,14 @@ redef class ASendExpr
                return e
        end
 
                return e
        end
 

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 
        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = intern_compile_call(v)
                if e != null then
        do
                var e = intern_compile_call(v)
                if e != null then

@@ -1564,9 +1564,9 @@ redef class ASendExpr
 end
 
 redef class ASendReassignExpr
 end
 
 redef class ASendReassignExpr

-       redef meth compile_expr(v) do abort
+       redef fun compile_expr(v) do abort

 
 

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var recv = v.compile_expr(n_expr)
                var cargs = new Array[String]
        do
                var recv = v.compile_expr(n_expr)
                var cargs = new Array[String]

@@ -1582,30 +1582,30 @@ redef class ASendReassignExpr
 end
 
 redef class ANewExpr
 end
 
 redef class ANewExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var cargs = new Array[String]
                compile_arguments_in(v, cargs)
                return prop.compile_constructor_call(v, stype, cargs)
        end
 
        do
                var cargs = new Array[String]
                compile_arguments_in(v, cargs)
                return prop.compile_constructor_call(v, stype, cargs)
        end
 

-       redef meth compile_stmt(v) do abort
+       redef fun compile_stmt(v) do abort

 end
 
 redef class PClosureDef
        # Compile the closure definition as a function in v.out_contexts
        # Return the cname of the function
 end
 
 redef class PClosureDef
        # Compile the closure definition as a function in v.out_contexts
        # Return the cname of the function

-       meth compile_closure(v: CompilerVisitor, closcn: String): String is abstract
+       fun compile_closure(v: CompilerVisitor, closcn: String): String is abstract

 
        # Compile the closure definition inside the current C function.
 
        # Compile the closure definition inside the current C function.

-       meth do_compile_inside(v: CompilerVisitor, params: nullable Array[String]): nullable String is abstract
+       fun do_compile_inside(v: CompilerVisitor, params: nullable Array[String]): nullable String is abstract

 end
 
 redef class AClosureDef
        # The cname of the function
 end
 
 redef class AClosureDef
        # The cname of the function

-       readable attr _cname: nullable String
+       readable var _cname: nullable String

 
 

-       redef meth compile_closure(v, closcn)
+       redef fun compile_closure(v, closcn)

        do
                var ctx_old = v.ctx
                v.ctx = new CContext
        do
                var ctx_old = v.ctx
                v.ctx = new CContext

@@ -1675,7 +1675,7 @@ redef class AClosureDef
                return "(&{closcnv})"
        end
 
                return "(&{closcnv})"
        end
 

-       protected meth decl_csignature(v: CompilerVisitor, args: Array[String], closcn: String): String
+       protected fun decl_csignature(v: CompilerVisitor, args: Array[String], closcn: String): String

        do
                var params = new Array[String]
                params.add("struct WBT_ *closctx")
        do
                var params = new Array[String]
                params.add("struct WBT_ *closctx")

@@ -1696,7 +1696,7 @@ redef class AClosureDef
                return s
        end
 
                return s
        end
 

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                for i in [0..variables.length[ do
                        var vacname = v.cfc.register_variable(variables[i])
        do
                for i in [0..variables.length[ do
                        var vacname = v.cfc.register_variable(variables[i])

@@ -1727,10 +1727,10 @@ redef class AClosureDef
 end
 
 redef class PClosureDecl
 end
 
 redef class PClosureDecl

-       meth do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract
+       fun do_compile_inside(v: CompilerVisitor, params: Array[String]): nullable String is abstract

 end
 redef class AClosureDecl
 end
 redef class AClosureDecl

-       redef meth do_compile_inside(v, params)
+       redef fun do_compile_inside(v, params)

        do
                n_signature.compile_parameters(v, variable.closure.signature, params)
 
        do
                n_signature.compile_parameters(v, variable.closure.signature, params)
 

@@ -1758,7 +1758,7 @@ redef class AClosureDecl
 end
 
 redef class AClosureCallExpr
 end
 
 redef class AClosureCallExpr

-       meth intern_compile_call(v: CompilerVisitor): nullable String
+       fun intern_compile_call(v: CompilerVisitor): nullable String

        do
                var cargs = new Array[String]
                compile_arguments_in(v, cargs)
        do
                var cargs = new Array[String]
                compile_arguments_in(v, cargs)

@@ -1803,14 +1803,14 @@ redef class AClosureCallExpr
                return va
        end
 
                return va
        end
 

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 
        do
                var e = intern_compile_call(v)
                assert e != null
                return e
        end
 

-       redef meth compile_stmt(v)
+       redef fun compile_stmt(v)

        do
                var e = intern_compile_call(v)
                if e != null then
        do
                var e = intern_compile_call(v)
                if e != null then

@@ -1820,14 +1820,14 @@ redef class AClosureCallExpr
 end
 
 redef class AProxyExpr
 end
 
 redef class AProxyExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                return v.compile_expr(n_expr)
        end
 end
 
 redef class AOnceExpr
        do
                return v.compile_expr(n_expr)
        end
 end
 
 redef class AOnceExpr

-       redef meth compile_expr(v)
+       redef fun compile_expr(v)

        do
                var i = v.new_number
                var cvar = v.cfc.get_var("Once expression result")
        do
                var i = v.new_number
                var cvar = v.cfc.get_var("Once expression result")

diff --git a/src/metamodel/abstractmetamodel.nit b/src/metamodel/abstractmetamodel.nit
index 8d53ece..47c6a41 100644 (file)
--- a/src/metamodel/abstractmetamodel.nit
+++ b/src/metamodel/abstractmetamodel.nit
@@ -26,20 +26,20 @@ class MMContext
        init do end
 
        # The module dependence hierarchy
        init do end
 
        # The module dependence hierarchy

-       readable attr _module_hierarchy: PartialOrder[MMModule] = new PartialOrder[MMModule]
+       readable var _module_hierarchy: PartialOrder[MMModule] = new PartialOrder[MMModule]

 
        # The class refinement and specialization hierarchy
        # It is not the real hierarchy since non concrete classes can only be leaves
 
        # The class refinement and specialization hierarchy
        # It is not the real hierarchy since non concrete classes can only be leaves

-       readable attr _class_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass]
+       readable var _class_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass]

 
        # All known global classes
 
        # All known global classes

-       attr _global_classes: Array[MMGlobalClass] = new Array[MMGlobalClass]
+       var _global_classes: Array[MMGlobalClass] = new Array[MMGlobalClass]

 
        # All known modules
 
        # All known modules

-       readable attr _modules: Array[MMModule] = new Array[MMModule]
+       readable var _modules: Array[MMModule] = new Array[MMModule]

 
        # Register a new module with the modules it depends on
 
        # Register a new module with the modules it depends on

-       meth add_module(module: MMModule, supers: Array[MMModule])
+       fun add_module(module: MMModule, supers: Array[MMModule])

        do
                _module_hierarchy.add(module, _module_hierarchy.select_smallests(supers))
                _modules.add(module)
        do
                _module_hierarchy.add(module, _module_hierarchy.select_smallests(supers))
                _modules.add(module)

@@ -47,10 +47,10 @@ class MMContext
        end
 
        # Register a global class
        end
 
        # Register a global class

-       private meth add_global_class(c: MMGlobalClass) do _global_classes.add(c)
+       private fun add_global_class(c: MMGlobalClass) do _global_classes.add(c)

 
        # Register a local class
 
        # Register a local class

-       meth add_local_class(c: MMLocalClass, sup: Array[MMLocalClass])
+       fun add_local_class(c: MMLocalClass, sup: Array[MMLocalClass])

        do
                var csup = new Array[MMLocalClass]
                var csups = new Array[String]
        do
                var csup = new Array[MMLocalClass]
                var csups = new Array[String]

@@ -72,23 +72,23 @@ end
 # Directory of modules
 class MMDirectory
        # Full name of the directory
 # Directory of modules
 class MMDirectory
        # Full name of the directory

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # Full path
 
        # Full path

-       readable attr _path: String
+       readable var _path: String

 
        # Parent directory
        # null if none
 
        # Parent directory
        # null if none

-       readable attr _parent: nullable MMDirectory
+       readable var _parent: nullable MMDirectory

 
        # The module that introduces the directory if any
 
        # The module that introduces the directory if any

-       readable writable attr _owner: nullable MMModule = null
+       readable writable var _owner: nullable MMModule = null

 
        # Known modules in the directory
 
        # Known modules in the directory

-       readable attr _modules: Map[Symbol, MMModule] = new HashMap[Symbol, MMModule]
+       readable var _modules: Map[Symbol, MMModule] = new HashMap[Symbol, MMModule]

 
        # Register a new module
 
        # Register a new module

-       meth add_module(module: MMModule)
+       fun add_module(module: MMModule)

        do
                assert not _modules.has_key(module.name)
                _modules[module.name] = module
        do
                assert not _modules.has_key(module.name)
                _modules[module.name] = module

@@ -101,7 +101,7 @@ class MMDirectory
        end
 
        # The fullname of a a potentiel module in the directory
        end
 
        # The fullname of a a potentiel module in the directory

-       meth full_name_for(module_name: Symbol): Symbol do
+       fun full_name_for(module_name: Symbol): Symbol do

                return "{name}/{module_name}".to_symbol
        end
 end
                return "{name}/{module_name}".to_symbol
        end
 end

@@ -109,49 +109,49 @@ end
 # A module is a NIT package
 class MMModule
        # Global context
 # A module is a NIT package
 class MMModule
        # Global context

-       readable attr _context: MMContext 
+       readable var _context: MMContext 

 
        # Short name of the module
 
        # Short name of the module

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # Full name of the module
 
        # Full name of the module

-       readable attr _full_name: Symbol
+       readable var _full_name: Symbol

 
        # The directory of the module
 
        # The directory of the module

-       readable attr _directory: MMDirectory
+       readable var _directory: MMDirectory

 
        # The filename of the module
 
        # The filename of the module

-       readable attr _filename: String
+       readable var _filename: String

 
        # Module dependence hierarchy element
 
        # Module dependence hierarchy element

-       readable attr _mhe: nullable PartialOrderElement[MMModule]
+       readable var _mhe: nullable PartialOrderElement[MMModule]

 
        # All global classes of the module (defined and imported)
 
        # All global classes of the module (defined and imported)

-       readable attr _global_classes: Array[MMGlobalClass] = new Array[MMGlobalClass]
+       readable var _global_classes: Array[MMGlobalClass] = new Array[MMGlobalClass]

 
        # All local classes of the module (defined and imported)
 
        # All local classes of the module (defined and imported)

-       readable attr _local_classes: Array[MMLocalClass] = new Array[MMLocalClass]
+       readable var _local_classes: Array[MMLocalClass] = new Array[MMLocalClass]

 
        # Class specialization hierarchy of the module.
 
        # Class specialization hierarchy of the module.

-       readable attr _class_specialization_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass]
+       readable var _class_specialization_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass]

 
        # Modules intruded (directly or not)
 
        # Modules intruded (directly or not)

-       attr _intrude_modules: Set[MMModule] = new HashSet[MMModule]
+       var _intrude_modules: Set[MMModule] = new HashSet[MMModule]

 
        # Module publicly imported (directly or not)
 
        # Module publicly imported (directly or not)

-       attr _public_modules: Set[MMModule] = new HashSet[MMModule]
+       var _public_modules: Set[MMModule] = new HashSet[MMModule]

 
        # Module privately imported (directly or not)
 
        # Module privately imported (directly or not)

-       attr _private_modules: Set[MMModule] = new HashSet[MMModule]
+       var _private_modules: Set[MMModule] = new HashSet[MMModule]

 
        # Explicit imported modules
 
        # Explicit imported modules

-       readable attr _explicit_imported_modules: Set[MMModule] = new HashSet[MMModule]
+       readable var _explicit_imported_modules: Set[MMModule] = new HashSet[MMModule]

 
        # Association between local class and global classes
 
        # Association between local class and global classes

-       attr _local_class_by_global: Map[MMGlobalClass, MMLocalClass] = new HashMap[MMGlobalClass, MMLocalClass]
+       var _local_class_by_global: Map[MMGlobalClass, MMLocalClass] = new HashMap[MMGlobalClass, MMLocalClass]

 
        # Dictionary of global classes
 
        # Dictionary of global classes

-       attr _global_class_by_name: Map[Symbol, MMGlobalClass] = new HashMap[Symbol, MMGlobalClass]
+       var _global_class_by_name: Map[Symbol, MMGlobalClass] = new HashMap[Symbol, MMGlobalClass]

 
        protected init(name: Symbol, dir: MMDirectory, context: MMContext, filename: String)
        do
 
        protected init(name: Symbol, dir: MMDirectory, context: MMContext, filename: String)
        do

@@ -166,7 +166,7 @@ class MMModule
        # 0 -> intrude
        # 1 -> public
        # 3 -> private
        # 0 -> intrude
        # 1 -> public
        # 3 -> private

-       meth add_super_module(m: MMModule, visibility_level: Int)
+       fun add_super_module(m: MMModule, visibility_level: Int)

        do
                _explicit_imported_modules.add(m)
                if visibility_level == 0 then
        do
                _explicit_imported_modules.add(m)
                if visibility_level == 0 then

@@ -191,7 +191,7 @@ class MMModule
        # 2 -> public => see public and protected
        # 1 -> private => see public and protected
        # 0 -> nothing => see nothing
        # 2 -> public => see public and protected
        # 1 -> private => see public and protected
        # 0 -> nothing => see nothing

-       meth visibility_for(m: MMModule): Int
+       fun visibility_for(m: MMModule): Int

        do
                if m == self or _intrude_modules.has(m) then
                        return 3
        do
                if m == self or _intrude_modules.has(m) then
                        return 3

@@ -206,34 +206,34 @@ class MMModule
 
 
        # Get the local class associated with a global class 
 
 
        # Get the local class associated with a global class 

-       meth [](c: MMGlobalClass): MMLocalClass
+       fun [](c: MMGlobalClass): MMLocalClass

        do
                return _local_class_by_global[c]
        end
 
        # Get a local class by its name
        do
                return _local_class_by_global[c]
        end
 
        # Get a local class by its name

-       meth class_by_name(n: Symbol): MMLocalClass
+       fun class_by_name(n: Symbol): MMLocalClass

        do
                return self[_global_class_by_name[n]]
        end
 
        # Is there a global class with this name
        do
                return self[_global_class_by_name[n]]
        end
 
        # Is there a global class with this name

-       meth has_global_class_named(n: Symbol): Bool
+       fun has_global_class_named(n: Symbol): Bool

        do
                return _global_class_by_name.has_key(n)
        end
 
        # Get a global class by its name.
        # Return null if not class match this name
        do
                return _global_class_by_name.has_key(n)
        end
 
        # Get a global class by its name.
        # Return null if not class match this name

-       meth global_class_named(n: Symbol): MMGlobalClass
+       fun global_class_named(n: Symbol): MMGlobalClass

        do
                return _global_class_by_name[n]
        end
 
        do
                return _global_class_by_name[n]
        end
 

-       redef meth to_s do return name.to_s
+       redef fun to_s do return name.to_s

 
        # Assign super_classes for a local class
 
        # Assign super_classes for a local class

-       meth set_supers_class(c: MMLocalClass, supers: Array[MMLocalClass])
+       fun set_supers_class(c: MMLocalClass, supers: Array[MMLocalClass])

        do
                var tab = _class_specialization_hierarchy.select_smallests(supers)
                c._cshe = _class_specialization_hierarchy.add(c,tab)
        do
                var tab = _class_specialization_hierarchy.select_smallests(supers)
                c._cshe = _class_specialization_hierarchy.add(c,tab)

@@ -243,7 +243,7 @@ class MMModule
        end
 
        # Register a local class and its global class in the module
        end
 
        # Register a local class and its global class in the module

-       private meth register_global_class(c: MMLocalClass)
+       private fun register_global_class(c: MMLocalClass)

        do
                _local_class_by_global[c.global] = c
        end
        do
                _local_class_by_global[c.global] = c
        end

@@ -251,11 +251,11 @@ end
 
 class MMGlobalClass
        # The introducing local class
 
 class MMGlobalClass
        # The introducing local class

-       readable attr _intro: MMLocalClass 
+       readable var _intro: MMLocalClass 

 
        # Class refinement hierarchy
        # It is not the real hierarchy since non concrete classes can only be leaves
 
        # Class refinement hierarchy
        # It is not the real hierarchy since non concrete classes can only be leaves

-       readable attr _class_refinement_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass] 
+       readable var _class_refinement_hierarchy: PartialOrder[MMLocalClass] = new PartialOrder[MMLocalClass] 

 
        # Create a new global class introduced with a given local class
        init(c: MMLocalClass)
 
        # Create a new global class introduced with a given local class
        init(c: MMLocalClass)

@@ -265,24 +265,24 @@ class MMGlobalClass
        end
 
        # The name of the global class
        end
 
        # The name of the global class

-       meth name: Symbol
+       fun name: Symbol

        do
                return intro.name
        end
 
        # The module that introduces the global class
        do
                return intro.name
        end
 
        # The module that introduces the global class

-       meth module: MMModule
+       fun module: MMModule

        do
                return intro.module
        end
 
        do
                return intro.module
        end
 

-       redef meth to_s
+       redef fun to_s

        do
                return intro.to_s
        end
 
        # register a new Local class to local class hierarchy (set the crhe value)
        do
                return intro.to_s
        end
 
        # register a new Local class to local class hierarchy (set the crhe value)

-       private meth register_local_class(c: MMLocalClass)
+       private fun register_local_class(c: MMLocalClass)

        do
                var sup = new Array[MMLocalClass]
                for s in class_refinement_hierarchy do
        do
                var sup = new Array[MMLocalClass]
                for s in class_refinement_hierarchy do

@@ -294,22 +294,22 @@ class MMGlobalClass
        end
 
        # Is the global class an interface?
        end
 
        # Is the global class an interface?

-       readable writable attr _is_interface: Bool = false
+       readable writable var _is_interface: Bool = false

 
        # Is the global class an abstract class?
 
        # Is the global class an abstract class?

-       readable writable attr _is_abstract: Bool = false
+       readable writable var _is_abstract: Bool = false

 
        # Is the global class a universal class?
 
        # Is the global class a universal class?

-       readable writable attr _is_universal: Bool = false
+       readable writable var _is_universal: Bool = false

 
        # Visibility of the global class
        # 1 -> public
        # 3 -> private
 
        # Visibility of the global class
        # 1 -> public
        # 3 -> private

-       readable writable attr _visibility_level: Int = 1 # FIXME: why this should be defined ?
+       readable writable var _visibility_level: Int = 1 # FIXME: why this should be defined ?

 
        # Is the global class a mixin class?
        # A mixin class inherits all constructors from a superclass
 
        # Is the global class a mixin class?
        # A mixin class inherits all constructors from a superclass

-       meth is_mixin: Bool
+       fun is_mixin: Bool

        do
                return _mixin_of != self
        end
        do
                return _mixin_of != self
        end

@@ -317,46 +317,46 @@ class MMGlobalClass
        # Indicate the superclass the class is a mixin of.
        # If mixin_of == self then the class is not a mixin
        # Is two classes have the same mixin_of value, then they both belong to the same mixing group
        # Indicate the superclass the class is a mixin of.
        # If mixin_of == self then the class is not a mixin
        # Is two classes have the same mixin_of value, then they both belong to the same mixing group

-       readable writable attr _mixin_of: MMGlobalClass = self
+       readable writable var _mixin_of: MMGlobalClass = self

 
 end
 
 # Local classes are classes defined, refined or imported in a module
 class MMLocalClass
        # The name of the local class
 
 end
 
 # Local classes are classes defined, refined or imported in a module
 class MMLocalClass
        # The name of the local class

-        readable attr _name: Symbol
+        readable var _name: Symbol

 
        # Arity of the local class (if generic)
        # FIXME: How to move this into the generic module in a sane way?
 
        # Arity of the local class (if generic)
        # FIXME: How to move this into the generic module in a sane way?

-       readable attr _arity : Int 
+       readable var _arity : Int 

 
        # The module of the local class
 
        # The module of the local class

-       readable attr _module: MMModule
+       readable var _module: MMModule

 
        # The global class of the local class
 
        # The global class of the local class

-       meth global: MMGlobalClass do return _global.as(not null)
-       attr _global: nullable MMGlobalClass
+       fun global: MMGlobalClass do return _global.as(not null)
+       var _global: nullable MMGlobalClass

 
        # The local class refinement hierarchy element
 
        # The local class refinement hierarchy element

-       meth crhe: PartialOrderElement[MMLocalClass] do return _crhe.as(not null)
-       attr _crhe: nullable PartialOrderElement[MMLocalClass]
+       fun crhe: PartialOrderElement[MMLocalClass] do return _crhe.as(not null)
+       var _crhe: nullable PartialOrderElement[MMLocalClass]

 
        # The local class specialization hierarchy element
 
        # The local class specialization hierarchy element

-       meth cshe: PartialOrderElement[MMLocalClass] do return _cshe.as(not null)
-       attr _cshe: nullable PartialOrderElement[MMLocalClass]
+       fun cshe: PartialOrderElement[MMLocalClass] do return _cshe.as(not null)
+       var _cshe: nullable PartialOrderElement[MMLocalClass]

 
        # The local class full hierarchy element
 
        # The local class full hierarchy element

-       meth che: PartialOrderElement[MMLocalClass] do return _che.as(not null)
-       attr _che: nullable PartialOrderElement[MMLocalClass]
+       fun che: PartialOrderElement[MMLocalClass] do return _che.as(not null)
+       var _che: nullable PartialOrderElement[MMLocalClass]

 
        # Association between local properties and global properties
 
        # Association between local properties and global properties

-       attr _local_property_by_global: Map[MMGlobalProperty, MMLocalProperty] = new HashMap[MMGlobalProperty, MMLocalProperty]
+       var _local_property_by_global: Map[MMGlobalProperty, MMLocalProperty] = new HashMap[MMGlobalProperty, MMLocalProperty]

 
        # All known global properties
 
        # All known global properties

-       readable attr _global_properties: Set[MMGlobalProperty] = new HashSet[MMGlobalProperty]
+       readable var _global_properties: Set[MMGlobalProperty] = new HashSet[MMGlobalProperty]

 
        # Dictionnary of global properties
 
        # Dictionnary of global properties

-       attr _properties_by_name: Map[Symbol, Array[MMGlobalProperty]] = new HashMap[Symbol, Array[MMGlobalProperty]]
+       var _properties_by_name: Map[Symbol, Array[MMGlobalProperty]] = new HashMap[Symbol, Array[MMGlobalProperty]]

 
        # Create a new class with a given name and arity
        protected init(mod: MMModule, name: Symbol, arity: Int)
 
        # Create a new class with a given name and arity
        protected init(mod: MMModule, name: Symbol, arity: Int)

@@ -368,13 +368,13 @@ class MMLocalClass
        end
 
        # The corresponding local class in another module
        end
 
        # The corresponding local class in another module

-       meth for_module(m: MMModule): MMLocalClass
+       fun for_module(m: MMModule): MMLocalClass

        do
                return m[global]
        end
        
        # Introduce a new global class to a new global one and register to hierarchy with no refine
        do
                return m[global]
        end
        
        # Introduce a new global class to a new global one and register to hierarchy with no refine

-       meth new_global
+       fun new_global

        do
                var g = new MMGlobalClass(self)
                _module._global_classes.add(g)
        do
                var g = new MMGlobalClass(self)
                _module._global_classes.add(g)

@@ -385,7 +385,7 @@ class MMLocalClass
        # Associate this local class to a global one and register to hierarchy
        # the global class for this class
        # refined classes for this class
        # Associate this local class to a global one and register to hierarchy
        # the global class for this class
        # refined classes for this class

-       meth set_global(g: MMGlobalClass)
+       fun set_global(g: MMGlobalClass)

        do
                _global = g
                _global.register_local_class(self)
        do
                _global = g
                _global.register_local_class(self)

@@ -394,14 +394,14 @@ class MMLocalClass
 
        # Is there a global propery with a given name
        # TODO: Will disapear when qualified names will be available
 
        # Is there a global propery with a given name
        # TODO: Will disapear when qualified names will be available

-       meth has_global_property_by_name(n: Symbol): Bool
+       fun has_global_property_by_name(n: Symbol): Bool

        do
                return _properties_by_name.has_key(n) and _properties_by_name[n].length == 1
        end
 
        # Get a global property by its name
        # TODO: Will disapear when qualified names will be available
        do
                return _properties_by_name.has_key(n) and _properties_by_name[n].length == 1
        end
 
        # Get a global property by its name
        # TODO: Will disapear when qualified names will be available

-       meth get_property_by_name(n: Symbol): MMGlobalProperty
+       fun get_property_by_name(n: Symbol): MMGlobalProperty

        do
                if not has_global_property_by_name(n) then abort
                var props = _properties_by_name[n]
        do
                if not has_global_property_by_name(n) then abort
                var props = _properties_by_name[n]

@@ -410,21 +410,21 @@ class MMLocalClass
 
        # Get a attribute by its name
        # TODO: Will disapear when qualified names will be available
 
        # Get a attribute by its name
        # TODO: Will disapear when qualified names will be available

-       meth attribute(a: Symbol): MMGlobalProperty
+       fun attribute(a: Symbol): MMGlobalProperty

        do
                return get_property_by_name(a)
        end
 
        # Get a method by its name
        # TODO: Will disapear when qualified names will be available
        do
                return get_property_by_name(a)
        end
 
        # Get a method by its name
        # TODO: Will disapear when qualified names will be available

-       meth method(na: Symbol): MMGlobalProperty
+       fun method(na: Symbol): MMGlobalProperty

        do
                return _properties_by_name[na].first
        end
 
        # Select a method from its name
        # TODO: Will disapear when qualified names will be available
        do
                return _properties_by_name[na].first
        end
 
        # Select a method from its name
        # TODO: Will disapear when qualified names will be available

-       meth select_method(name: Symbol): MMMethod
+       fun select_method(name: Symbol): MMMethod

        do
                var gp = method(name)
                var res = self[gp]
        do
                var gp = method(name)
                var res = self[gp]

@@ -434,7 +434,7 @@ class MMLocalClass
        
        # Select an attribute from its name
        # TODO: Will disapear when qualified names will be available
        
        # Select an attribute from its name
        # TODO: Will disapear when qualified names will be available

-       meth select_attribute(name: Symbol): MMAttribute
+       fun select_attribute(name: Symbol): MMAttribute

        do
                var gp = attribute(name)
                var res = self[gp]
        do
                var gp = attribute(name)
                var res = self[gp]

@@ -444,7 +444,7 @@ class MMLocalClass
        
        # Look in super-classes (by specialization) and return properties with name
        # Beware, global property of results is not intended to be the same
        
        # Look in super-classes (by specialization) and return properties with name
        # Beware, global property of results is not intended to be the same

-       meth super_methods_named(n: Symbol): Array[MMLocalProperty] 
+       fun super_methods_named(n: Symbol): Array[MMLocalProperty] 

        do
                var classes = new Array[MMLocalClass]
                for c in cshe.greaters do
        do
                var classes = new Array[MMLocalClass]
                for c in cshe.greaters do

@@ -461,13 +461,13 @@ class MMLocalClass
        end
 
        # Register a local property and associate it with its global property
        end
 
        # Register a local property and associate it with its global property

-       meth register_local_property(p: MMLocalProperty)
+       fun register_local_property(p: MMLocalProperty)

        do
                _local_property_by_global[p.global] = p
        end
 
        # Register a global property and associate it with its name
        do
                _local_property_by_global[p.global] = p
        end
 
        # Register a global property and associate it with its name

-       meth register_global_property(glob: MMGlobalProperty)
+       fun register_global_property(glob: MMGlobalProperty)

        do
                var prop = glob.intro
                var name = prop.name
        do
                var prop = glob.intro
                var name = prop.name

@@ -481,21 +481,21 @@ class MMLocalClass
        end
 
        # Does the global property belong to the class?
        end
 
        # Does the global property belong to the class?

-       meth has_global_property(glob: MMGlobalProperty): Bool
+       fun has_global_property(glob: MMGlobalProperty): Bool

        do
                return _global_properties.has(glob)
        end
 
        # Get a local proprty by its global property
        do
                return _global_properties.has(glob)
        end
 
        # Get a local proprty by its global property

-       meth [](glob: MMGlobalProperty): MMLocalProperty
+       fun [](glob: MMGlobalProperty): MMLocalProperty

        do
                return _local_property_by_global[glob]
        end
 
        # The current MMContext
        do
                return _local_property_by_global[glob]
        end
 
        # The current MMContext

-       meth context: MMContext do return module.context
+       fun context: MMContext do return module.context

 
 

-       redef meth to_s
+       redef fun to_s

        do
                return _name.to_s
        end
        do
                return _name.to_s
        end

@@ -506,16 +506,16 @@ class MMGlobalProperty
        # The local property for each class that has the global property
 
        # The introducing local property
        # The local property for each class that has the global property
 
        # The introducing local property

-       readable attr _intro: MMLocalProperty
+       readable var _intro: MMLocalProperty

 
        # The local class that introduces the global property
 
        # The local class that introduces the global property

-       meth local_class: MMLocalClass
+       fun local_class: MMLocalClass

        do
                return intro.local_class
        end
 
        # The property redefinition hierarchy
        do
                return intro.local_class
        end
 
        # The property redefinition hierarchy

-       readable attr _property_hierarchy: PartialOrder[MMLocalProperty] = new PartialOrder[MMLocalProperty]
+       readable var _property_hierarchy: PartialOrder[MMLocalProperty] = new PartialOrder[MMLocalProperty]

 
        # Create a new global property introduced by a local one
        protected init(p: MMLocalProperty)
 
        # Create a new global property introduced by a local one
        protected init(p: MMLocalProperty)

@@ -524,25 +524,25 @@ class MMGlobalProperty
                add_local_property(p, new Array[MMLocalProperty])
        end
 
                add_local_property(p, new Array[MMLocalProperty])
        end
 

-       redef meth to_s do return intro.full_name
+       redef fun to_s do return intro.full_name

 
        # Register a new local property
 
        # Register a new local property

-       meth add_local_property(i: MMLocalProperty, sup: Array[MMLocalProperty])
+       fun add_local_property(i: MMLocalProperty, sup: Array[MMLocalProperty])

        do
                i._prhe = _property_hierarchy.add(i,sup)
        end
 
        # Is the global property an attribute ?
        do
                i._prhe = _property_hierarchy.add(i,sup)
        end
 
        # Is the global property an attribute ?

-       meth is_attribute: Bool do return intro isa MMAttribute
+       fun is_attribute: Bool do return intro isa MMAttribute

 
        # Is the global property a method (or a constructor)?
 
        # Is the global property a method (or a constructor)?

-       meth is_method: Bool do return intro isa MMMethod
+       fun is_method: Bool do return intro isa MMMethod

 
        # Is the global property a constructor (thus also a method)?
 
        # Is the global property a constructor (thus also a method)?

-       readable writable attr _is_init: Bool = false
+       readable writable var _is_init: Bool = false

 
        # Is the global property a constructor for a given class?
 
        # Is the global property a constructor for a given class?

-       meth is_init_for(c: MMLocalClass): Bool
+       fun is_init_for(c: MMLocalClass): Bool

        do
                if not is_init then return false
                var sc = intro.local_class
        do
                if not is_init then return false
                var sc = intro.local_class

@@ -554,33 +554,33 @@ class MMGlobalProperty
        # 1 -> public
        # 2 -> protected
        # 3 -> private
        # 1 -> public
        # 2 -> protected
        # 3 -> private

-       readable writable attr _visibility_level: Int = 1 # FIXME: why this should be defined ?
+       readable writable var _visibility_level: Int = 1 # FIXME: why this should be defined ?

 end
 
 # Local properties are properties defined (explicitely or not) in a local class
 class MMLocalProperty
        # The name of the property
 end
 
 # Local properties are properties defined (explicitely or not) in a local class
 class MMLocalProperty
        # The name of the property

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # The local class who own the local property
 
        # The local class who own the local property

-       readable attr _local_class: MMLocalClass
+       readable var _local_class: MMLocalClass

 
        # The global property where belong the local property
 
        # The global property where belong the local property

-       attr _global: nullable MMGlobalProperty
+       var _global: nullable MMGlobalProperty

 
 

-       meth global: MMGlobalProperty do return _global.as(not null)
-       meth is_global_set: Bool do return _global != null
+       fun global: MMGlobalProperty do return _global.as(not null)
+       fun is_global_set: Bool do return _global != null

 
        # Redefinition hierarchy of the local property
 
        # Redefinition hierarchy of the local property

-       attr _prhe: nullable PartialOrderElement[MMLocalProperty]
+       var _prhe: nullable PartialOrderElement[MMLocalProperty]

 
 

-       meth prhe: PartialOrderElement[MMLocalProperty] do return _prhe.as(not null)
+       fun prhe: PartialOrderElement[MMLocalProperty] do return _prhe.as(not null)

 
        # The module of the local property
 
        # The module of the local property

-       meth module: MMModule do return _local_class.module
+       fun module: MMModule do return _local_class.module

 
        # Full expanded name with all qualifications
 
        # Full expanded name with all qualifications

-       meth full_name: String
+       fun full_name: String

        do
                if _global == null then
                        return "{local_class.module}::{local_class}::(?::{name})"
        do
                if _global == null then
                        return "{local_class.module}::{local_class}::(?::{name})"

@@ -592,14 +592,14 @@ class MMLocalProperty
        end
 
        # set the global property for this property
        end
 
        # set the global property for this property

-       meth set_global(g: MMGlobalProperty)
+       fun set_global(g: MMGlobalProperty)

        do
                _global = g
                _local_class.register_local_property(self)
        end
 
        # Introduce a new global property for this local one
        do
                _global = g
                _local_class.register_local_property(self)
        end
 
        # Introduce a new global property for this local one

-       meth new_global
+       fun new_global

        do
                assert _global == null
                var global = new MMGlobalProperty(self)
        do
                assert _global == null
                var global = new MMGlobalProperty(self)

@@ -607,10 +607,10 @@ class MMLocalProperty
                _local_class.register_global_property(global)
        end
 
                _local_class.register_global_property(global)
        end
 

-       redef meth to_s do return name.to_s
+       redef fun to_s do return name.to_s

 
        # Is the concrete property contain a `super' in the body?
 
        # Is the concrete property contain a `super' in the body?

-       readable writable attr _need_super: Bool = false
+       readable writable var _need_super: Bool = false

 
        protected init(n: Symbol, bc: MMLocalClass)
        do
 
        protected init(n: Symbol, bc: MMLocalClass)
        do

diff --git a/src/metamodel/genericity.nit b/src/metamodel/genericity.nit
index dd84e14..79efb24 100644 (file)
--- a/src/metamodel/genericity.nit
+++ b/src/metamodel/genericity.nit
@@ -23,14 +23,14 @@ intrude import inheritance
 
 redef class MMLocalClass
        # The pos-th formal type parameter
 
 redef class MMLocalClass
        # The pos-th formal type parameter

-       meth get_formal(pos: Int): MMTypeFormalParameter
+       fun get_formal(pos: Int): MMTypeFormalParameter

        do
                return formals_types[pos]
        end
 
        # Register a new formal type
        # Called in order during the building of the class
        do
                return formals_types[pos]
        end
 
        # Register a new formal type
        # Called in order during the building of the class

-       meth register_formal(f: MMTypeFormalParameter)
+       fun register_formal(f: MMTypeFormalParameter)

        do
                assert f.def_class == self
                assert f.position == _formals_types.length
        do
                assert f.def_class == self
                assert f.position == _formals_types.length

@@ -38,10 +38,10 @@ redef class MMLocalClass
        end
 
        # All the insanciated types of the class
        end
 
        # All the insanciated types of the class

-       attr _types: Array[MMTypeGeneric] = new Array[MMTypeGeneric]
+       var _types: Array[MMTypeGeneric] = new Array[MMTypeGeneric]

 
        # Instanciate a type from the generic class
 
        # Instanciate a type from the generic class

-       meth get_instantiate_type(t: Array[MMType]): MMType
+       fun get_instantiate_type(t: Array[MMType]): MMType

        do
                for g in _types do
                        if g.params_equals(t) then return g
        do
                for g in _types do
                        if g.params_equals(t) then return g

@@ -52,11 +52,11 @@ redef class MMLocalClass
        end
 
        # The formal types of the class
        end
 
        # The formal types of the class

-       attr _formals_types: Array[MMTypeFormalParameter] = new Array[MMTypeFormalParameter]
+       var _formals_types: Array[MMTypeFormalParameter] = new Array[MMTypeFormalParameter]

 
        # Return the definition formal types for the class
        # Import them from the intro class if needed
 
        # Return the definition formal types for the class
        # Import them from the intro class if needed

-       private meth formals_types: Array[MMTypeFormalParameter]
+       private fun formals_types: Array[MMTypeFormalParameter]

        do
                if _formals_types.is_empty then
                        assert not self isa MMConcreteClass
        do
                if _formals_types.is_empty then
                        assert not self isa MMConcreteClass

@@ -77,7 +77,7 @@ redef class MMLocalClass
                return _formals_types
        end
 
                return _formals_types
        end
 

-       redef meth get_type
+       redef fun get_type

        do
                if _base_type_cache == null and is_generic then
                        _base_type_cache = get_instantiate_type(formals_types)
        do
                if _base_type_cache == null and is_generic then
                        _base_type_cache = get_instantiate_type(formals_types)

@@ -88,30 +88,30 @@ redef class MMLocalClass
        end
 
        # Is the class a generic one?
        end
 
        # Is the class a generic one?

-       meth is_generic: Bool do return arity > 0
+       fun is_generic: Bool do return arity > 0

 end
 
 redef class MMType
        # TODO: IS this useful? 
 end
 
 redef class MMType
        # TODO: IS this useful? 

-       meth is_generic: Bool is abstract
+       fun is_generic: Bool is abstract

 end
 
 redef class MMTypeFormal
 end
 
 redef class MMTypeFormal

-       redef meth is_generic do return _bound.is_generic
+       redef fun is_generic do return _bound.is_generic

 end
 
 redef class MMTypeSimpleClass
 end
 
 redef class MMTypeSimpleClass

-       redef meth is_generic  do return false
+       redef fun is_generic  do return false

 end
 
 class MMTypeGeneric
 special MMTypeClass
        # Formal arguments
 end
 
 class MMTypeGeneric
 special MMTypeClass
        # Formal arguments

-       readable attr _params: Array[MMType] 
+       readable var _params: Array[MMType] 

 
 

-       redef meth is_generic do return true
+       redef fun is_generic do return true

 
 

-       redef meth is_supertype(t)
+       redef fun is_supertype(t)

        do
                if t.local_class.cshe <= _local_class then
                        var u = t.upcast_for(_local_class)
        do
                if t.local_class.cshe <= _local_class then
                        var u = t.upcast_for(_local_class)

@@ -122,7 +122,7 @@ special MMTypeClass
                return false
        end
 
                return false
        end
 

-       redef meth upcast_for(c)
+       redef fun upcast_for(c)

        do
                var t = super
                if t != self then
        do
                var t = super
                if t != self then

@@ -131,7 +131,7 @@ special MMTypeClass
                return t
        end
 
                return t
        end
 

-       redef meth for_module(mod)
+       redef fun for_module(mod)

        do
                var t: MMType = self
                if module != mod then
        do
                var t: MMType = self
                if module != mod then

@@ -145,7 +145,7 @@ special MMTypeClass
                return t
        end
 
                return t
        end
 

-       redef meth adapt_to(r)
+       redef fun adapt_to(r)

        do
                var rv = new Array[MMType]
                for i in _params do
        do
                var rv = new Array[MMType]
                for i in _params do

@@ -155,7 +155,7 @@ special MMTypeClass
                return l
        end
 
                return l
        end
 

-       private meth params_equals(t: Array[MMType]): Bool
+       private fun params_equals(t: Array[MMType]): Bool

        do
                if t.length != _params.length then
                        return false
        do
                if t.length != _params.length then
                        return false

@@ -168,14 +168,14 @@ special MMTypeClass
                return true
        end
 
                return true
        end
 

-       redef meth to_s
+       redef fun to_s

        do
                return "{super}[{_params.join(", ")}]"
        end
        
        # Is self a subtype of t?
        # Require that t.local_class = self.local_class
        do
                return "{super}[{_params.join(", ")}]"
        end
        
        # Is self a subtype of t?
        # Require that t.local_class = self.local_class

-       private meth is_subtype(t: MMTypeGeneric) : Bool
+       private fun is_subtype(t: MMTypeGeneric) : Bool

        do
                for i in [0.._params.length[
                do
        do
                for i in [0.._params.length[
                do

@@ -196,14 +196,14 @@ end
 class MMTypeFormalParameter
 special MMTypeFormal
        # The class where self is defined
 class MMTypeFormalParameter
 special MMTypeFormal
        # The class where self is defined

-       readable attr _def_class: MMLocalClass 
+       readable var _def_class: MMLocalClass 

 
        # The position is self in def_class
 
        # The position is self in def_class

-       readable attr _position: Int 
+       readable var _position: Int 

 
 

-       redef meth module do return _def_class.module
+       redef fun module do return _def_class.module

 
 

-       redef meth for_module(mod)
+       redef fun for_module(mod)

        do
                var t: MMType = self
                if module != mod then
        do
                var t: MMType = self
                if module != mod then

@@ -212,15 +212,15 @@ special MMTypeFormal
                return t
        end
 
                return t
        end
 

-       redef meth upcast_for(c) do return _bound.upcast_for(c)
+       redef fun upcast_for(c) do return _bound.upcast_for(c)

 
 

-       meth bound=(t: MMType)
+       fun bound=(t: MMType)

        do
                assert _bound == null
                _bound = t
        end
 
        do
                assert _bound == null
                _bound = t
        end
 

-       redef meth adapt_to(r)
+       redef fun adapt_to(r)

        do
                r = r.direct_type
                var old_r = r.upcast_for(def_class)
        do
                r = r.direct_type
                var old_r = r.upcast_for(def_class)

@@ -248,7 +248,7 @@ special MMTypeFormal
 end
 
 redef class MMTypeNone
 end
 
 redef class MMTypeNone

-       redef meth is_generic do return false
-       redef meth for_module(mod) do return self
-       redef meth adapt_to(r) do return self
+       redef fun is_generic do return false
+       redef fun for_module(mod) do return self
+       redef fun adapt_to(r) do return self

 end
 end

diff --git a/src/metamodel/inheritance.nit b/src/metamodel/inheritance.nit
index 2b2275b..aaca1da 100644 (file)
--- a/src/metamodel/inheritance.nit
+++ b/src/metamodel/inheritance.nit
@@ -22,14 +22,14 @@ intrude import static_type
 
 redef class MMModule
        # The root of the class hierarchy
 
 redef class MMModule
        # The root of the class hierarchy

-       meth type_any: MMType
+       fun type_any: MMType

        do
                var c_name = class_by_name(once ("Object".to_symbol))
                return c_name.get_type
        end
 
        # Import global classes from supermodules
        do
                var c_name = class_by_name(once ("Object".to_symbol))
                return c_name.get_type
        end
 
        # Import global classes from supermodules

-       meth import_global_classes
+       fun import_global_classes

        do
                var globals = new HashMap[MMGlobalClass,HashSet[MMLocalClass]]
                assert mhe != null
        do
                var globals = new HashMap[MMGlobalClass,HashSet[MMLocalClass]]
                assert mhe != null

@@ -44,7 +44,7 @@ redef class MMModule
        end 
        
        # Create implicit local classes for global classes that are not refined
        end 
        
        # Create implicit local classes for global classes that are not refined

-       meth import_local_classes
+       fun import_local_classes

        do
                for g in _global_classes do
                        if _local_class_by_global.has_key(g) then continue
        do
                for g in _global_classes do
                        if _local_class_by_global.has_key(g) then continue

@@ -55,14 +55,14 @@ end
 
 redef class MMLocalClass
        # List of all parents
 
 redef class MMLocalClass
        # List of all parents

-       attr _direct_parents: Array[MMAncestor] = new Array[MMAncestor]
+       var _direct_parents: Array[MMAncestor] = new Array[MMAncestor]

 
        # Is the class computing super.
        # Used to detect specialization loops.
 
        # Is the class computing super.
        # Used to detect specialization loops.

-       attr _computing_super: Bool = false 
+       var _computing_super: Bool = false 

 
        # Compute super classes of a class
 
        # Compute super classes of a class

-       meth compute_super_classes
+       fun compute_super_classes

        do
                if computed_super_classes then
                        # do no recompute if allready done
        do
                if computed_super_classes then
                        # do no recompute if allready done

@@ -88,7 +88,7 @@ redef class MMLocalClass
        end
 
        # Compute ancestors for a class
        end
 
        # Compute ancestors for a class

-       meth compute_ancestors
+       fun compute_ancestors

        do
                assert computed_super_classes
                if computed_ancestors then return
        do
                assert computed_super_classes
                if computed_ancestors then return

@@ -106,10 +106,10 @@ redef class MMLocalClass
                end
        end
 
                end
        end
 

-       attr _are_global_properties_inherited: Bool = false
+       var _are_global_properties_inherited: Bool = false

 
        # Inherit global properties for a class
 
        # Inherit global properties for a class

-       meth inherit_global_properties
+       fun inherit_global_properties

        do
                if _are_global_properties_inherited then return
                _are_global_properties_inherited = true
        do
                if _are_global_properties_inherited then return
                _are_global_properties_inherited = true

@@ -135,7 +135,7 @@ redef class MMLocalClass
        end
 
        # Make the name of a global property meaningful in the class
        end
 
        # Make the name of a global property meaningful in the class

-       meth make_visible_an_inherited_global_property(glob: MMGlobalProperty)
+       fun make_visible_an_inherited_global_property(glob: MMGlobalProperty)

        do
                var names = _properties_by_name
                var gname = glob.intro.name
        do
                var names = _properties_by_name
                var gname = glob.intro.name

@@ -150,26 +150,26 @@ redef class MMLocalClass
        end
 
        # Add super stype of this current local class
        end
 
        # Add super stype of this current local class

-       meth add_direct_parent(p: MMAncestor)
+       fun add_direct_parent(p: MMAncestor)

        do
                _direct_parents.add(p)
        end
 
        # Are super-class already computed?
        do
                _direct_parents.add(p)
        end
 
        # Are super-class already computed?

-       meth computed_super_classes: Bool
+       fun computed_super_classes: Bool

        do
                return _crhe != null and _cshe != null
        end
        
        # Are ancestors already computed
        do
                return _crhe != null and _cshe != null
        end
        
        # Are ancestors already computed

-       meth computed_ancestors: Bool
+       fun computed_ancestors: Bool

        do
                return _ancestors != null
        end
 
        # Get the ancestor for a given class
        # TODO: is this useful?
        do
                return _ancestors != null
        end
 
        # Get the ancestor for a given class
        # TODO: is this useful?

-       private meth ancestor_for(c: MMLocalClass): MMAncestor
+       private fun ancestor_for(c: MMLocalClass): MMAncestor

        do      
                assert ancestors != null
 
        do      
                assert ancestors != null
 

@@ -190,7 +190,7 @@ redef class MMLocalClass
                return ra
        end
 
                return ra
        end
 

-       redef meth [](glob)
+       redef fun [](glob)

        do
                if _local_property_by_global.has_key(glob) then
                        return _local_property_by_global[glob]
        do
                if _local_property_by_global.has_key(glob) then
                        return _local_property_by_global[glob]

@@ -202,7 +202,7 @@ redef class MMLocalClass
        end
 
        # Add default super class in direct parent and in super classes if this is not the Object class
        end
 
        # Add default super class in direct parent and in super classes if this is not the Object class

-       private meth add_default_any_class(supers: Array[MMLocalClass])
+       private fun add_default_any_class(supers: Array[MMLocalClass])

        do
                if supers.is_empty and name != once ("Object".to_symbol) then
                        var t_any = module.type_any
        do
                if supers.is_empty and name != once ("Object".to_symbol) then
                        var t_any = module.type_any

@@ -213,7 +213,7 @@ redef class MMLocalClass
        end
        
        # Adding inherited class from previous refinement of self
        end
        
        # Adding inherited class from previous refinement of self

-       private meth add_super_classes(supers: Array[MMLocalClass])
+       private fun add_super_classes(supers: Array[MMLocalClass])

        do
                assert _crhe != null
                for ref in _crhe.direct_greaters do
        do
                assert _crhe != null
                for ref in _crhe.direct_greaters do

@@ -225,7 +225,7 @@ redef class MMLocalClass
        end
        
        # Add self parents of this local class
        end
        
        # Add self parents of this local class

-       private meth add_explicit_classes(supers: Array[MMLocalClass])
+       private fun add_explicit_classes(supers: Array[MMLocalClass])

        do
                for p in _direct_parents do
                        supers.add(p.local_class)
        do
                for p in _direct_parents do
                        supers.add(p.local_class)

@@ -233,7 +233,7 @@ redef class MMLocalClass
        end
 
        # Ensure all super parents are computed
        end
 
        # Ensure all super parents are computed

-       private meth compute_super_parents(supers: Array[MMLocalClass])
+       private fun compute_super_parents(supers: Array[MMLocalClass])

        do
                for p in supers do
                        p.compute_super_classes
        do
                for p in supers do
                        p.compute_super_classes

@@ -241,7 +241,7 @@ redef class MMLocalClass
        end
 
        # compute all ancestors for a class (multiple)
        end
 
        # compute all ancestors for a class (multiple)

-       private meth build_ancestors: Array[MMAncestor]
+       private fun build_ancestors: Array[MMAncestor]

        do
                var all_ancestors = new Array[MMAncestor]
                # Refined classes are ancestors
        do
                var all_ancestors = new Array[MMAncestor]
                # Refined classes are ancestors

@@ -259,7 +259,7 @@ redef class MMLocalClass
        end
 
        # Build an ancestor map indexed by LocalClass
        end
 
        # Build an ancestor map indexed by LocalClass

-       private meth group_ancestors(all: Array[MMAncestor]): Map[MMLocalClass, Set[MMAncestor]]
+       private fun group_ancestors(all: Array[MMAncestor]): Map[MMLocalClass, Set[MMAncestor]]

        do
                #print "process {self}"
                var map = new HashMap[MMLocalClass, Set[MMAncestor]]
        do
                #print "process {self}"
                var map = new HashMap[MMLocalClass, Set[MMAncestor]]

@@ -281,7 +281,7 @@ redef class MMLocalClass
        end
 
        # Remove duplicate ancestors and merge if compatible, in the other case do an error
        end
 
        # Remove duplicate ancestors and merge if compatible, in the other case do an error

-       private meth merge_ancestors(set: Set[MMAncestor]): MMAncestor
+       private fun merge_ancestors(set: Set[MMAncestor]): MMAncestor

        do
                var marks = new HashSet[MMAncestor]
                var res = new Array[MMAncestor]
        do
                var marks = new HashSet[MMAncestor]
                var res = new Array[MMAncestor]

@@ -316,7 +316,7 @@ redef class MMLocalClass
        # Inherit a local property
        # Is lazily called
        # FIXME: dont crash lazily
        # Inherit a local property
        # Is lazily called
        # FIXME: dont crash lazily

-       private meth inherit_local_property(glob: MMGlobalProperty): MMLocalProperty
+       private fun inherit_local_property(glob: MMGlobalProperty): MMLocalProperty

        do
                assert not _local_property_by_global.has_key(glob)
 
        do
                assert not _local_property_by_global.has_key(glob)
 

@@ -368,7 +368,7 @@ end
 
 redef class MMLocalProperty
        # Attach self to a global property
 
 redef class MMLocalProperty
        # Attach self to a global property

-       meth inherit_global(g: MMGlobalProperty)
+       fun inherit_global(g: MMGlobalProperty)

        do
                set_global(g)
                var impls = new Array[MMLocalProperty]
        do
                set_global(g)
                var impls = new Array[MMLocalProperty]

@@ -382,7 +382,7 @@ end
 
 redef class MMAncestor
        # Add this ancestor and it's super one in tab
 
 redef class MMAncestor
        # Add this ancestor and it's super one in tab

-       private meth add_in(tab: Array[MMAncestor])
+       private fun add_in(tab: Array[MMAncestor])

        do
                tab.add(self)
                stype.local_class.compute_ancestors
        do
                tab.add(self)
                stype.local_class.compute_ancestors

@@ -419,7 +419,7 @@ end
 
 class MMRefineAncestor
 special MMAncestor
 
 class MMRefineAncestor
 special MMAncestor

-       redef readable attr _local_class: MMLocalClass
+       redef readable var _local_class: MMLocalClass

 
        init(b: MMLocalClass, a: MMLocalClass)
        do
 
        init(b: MMLocalClass, a: MMLocalClass)
        do

@@ -432,7 +432,7 @@ end
 
 class MMSpecAncestor
 special MMAncestor
 
 class MMSpecAncestor
 special MMAncestor

-       redef meth local_class do return stype.local_class
+       redef fun local_class do return stype.local_class

 
        init(inheriter: MMType, stype: MMType)
        do
 
        init(inheriter: MMType, stype: MMType)
        do

@@ -443,7 +443,7 @@ end
 
 class MMDefaultAncestor
 special MMAncestor
 
 class MMDefaultAncestor
 special MMAncestor

-       redef meth local_class do return stype.local_class
+       redef fun local_class do return stype.local_class

 
        init(b: MMLocalClass, anc: MMType)
        do
 
        init(b: MMLocalClass, anc: MMType)
        do

diff --git a/src/metamodel/partial_order.nit b/src/metamodel/partial_order.nit
index 64cefc1..9fe3ba3 100644 (file)
--- a/src/metamodel/partial_order.nit
+++ b/src/metamodel/partial_order.nit
@@ -22,27 +22,27 @@ package partial_order
 class PartialOrder[E]
 special Collection[E]
        # Elements
 class PartialOrder[E]
 special Collection[E]
        # Elements

-       attr _elements: Map[E, PartialOrderElement[E]]
+       var _elements: Map[E, PartialOrderElement[E]]

 
        # Elements
 
        # Elements

-       attr _elements_list: Array[E]
+       var _elements_list: Array[E]

 
        # The roots of the hierarchy are elements without greaters
 
        # The roots of the hierarchy are elements without greaters

-       readable attr _roots: Array[E]
+       readable var _roots: Array[E]

 
 # Collection
 
 
 # Collection
 

-       redef meth is_empty do return _elements.is_empty
+       redef fun is_empty do return _elements.is_empty

        
        

-       redef meth length do return _elements.length
+       redef fun length do return _elements.length

 
 

-       redef meth first do return _elements_list.first
+       redef fun first do return _elements_list.first

 
 

-       redef meth has(e) do return _elements.has_key(e)
+       redef fun has(e) do return _elements.has_key(e)

 
 

-       redef meth has_only(e) do return _elements.length == 1 and _elements.first == e
+       redef fun has_only(e) do return _elements.length == 1 and _elements.first == e

 
 

-       redef meth count(e)
+       redef fun count(e)

        do
                if has(e) then
                        return 1
        do
                if has(e) then
                        return 1

@@ -51,18 +51,18 @@ special Collection[E]
                end
        end
 
                end
        end
 

-       redef meth iterator do return _elements_list.iterator
+       redef fun iterator do return _elements_list.iterator

 
 # Access       
 
        # Return the element associed with the item
 
 # Access       
 
        # Return the element associed with the item

-       meth [](e: E): PartialOrderElement[E]
+       fun [](e: E): PartialOrderElement[E]

        do
                return _elements[e]
        end
 
        # Return a dot representation
        do
                return _elements[e]
        end
 
        # Return a dot representation

-       meth to_dot: String
+       fun to_dot: String

        do
                var s = new Buffer
                s.append(to_dot_header)
        do
                var s = new Buffer
                s.append(to_dot_header)

@@ -77,25 +77,25 @@ special Collection[E]
        end
 
        # Called to display the header
        end
 
        # Called to display the header

-       protected meth to_dot_header: String
+       protected fun to_dot_header: String

        do
                return "digraph G \{\ngraph [rankdir=BT];\n"
        end
        
        # Called to display a node
        do
                return "digraph G \{\ngraph [rankdir=BT];\n"
        end
        
        # Called to display a node

-       protected meth to_dot_node(e: E): String
+       protected fun to_dot_node(e: E): String

        do
                return "\"{e}\";\n"
        end
 
        # Called to draw an edge between `e1' and `e2' when `e1' < `e2' 
        do
                return "\"{e}\";\n"
        end
 
        # Called to draw an edge between `e1' and `e2' when `e1' < `e2' 

-       protected meth to_dot_edge(e1: E, e2: E): String
+       protected fun to_dot_edge(e1: E, e2: E): String

        do
                return "\"{e1}\" -> \"{e2}\";\n"
        end
 
        # Get an array consisting of only minimal elements
        do
                return "\"{e1}\" -> \"{e2}\";\n"
        end
 
        # Get an array consisting of only minimal elements

-       meth select_smallests(c: nullable Collection[E]): Array[E]
+       fun select_smallests(c: nullable Collection[E]): Array[E]

        do
                if c == null then return new Array[E]
                assert has_all(c)
        do
                if c == null then return new Array[E]
                assert has_all(c)

@@ -116,7 +116,7 @@ special Collection[E]
        end
 
        # Add a new element inferior of some others
        end
 
        # Add a new element inferior of some others

-       meth add(e: E, supers: nullable Collection[E]): PartialOrderElement[E]
+       fun add(e: E, supers: nullable Collection[E]): PartialOrderElement[E]

        do
                assert not has(e)
                assert supers == null or has_all(supers)
        do
                assert not has(e)
                assert supers == null or has_all(supers)

@@ -131,7 +131,7 @@ special Collection[E]
        end
 
        # Are all these elements in the order
        end
 
        # Are all these elements in the order

-       meth has_all(e: Collection[E]): Bool
+       fun has_all(e: Collection[E]): Bool

        do
                for i in e do
                        if not has(i) then
        do
                for i in e do
                        if not has(i) then

@@ -142,12 +142,12 @@ special Collection[E]
        end
 
        # factory for partial order elements
        end
 
        # factory for partial order elements

-       protected meth new_poe(e: E, directs: Array[E]): PartialOrderElement[E]
+       protected fun new_poe(e: E, directs: Array[E]): PartialOrderElement[E]

        do
                return new PartialOrderElement[E](self, e, directs)
        end
 
        do
                return new PartialOrderElement[E](self, e, directs)
        end
 

-       protected meth add_to_smallests(e: E, from: Array[E], to: Array[E]): Bool
+       protected fun add_to_smallests(e: E, from: Array[E], to: Array[E]): Bool

        # an element `e' 
        # some others elements `from' incomparable two by two
        # Return false if `from' < e
        # an element `e' 
        # some others elements `from' incomparable two by two
        # Return false if `from' < e

@@ -168,7 +168,7 @@ special Collection[E]
                return true
        end
 
                return true
        end
 

-       protected meth compute_smallers_for(poe: PartialOrderElement[E], set: Set[E])
+       protected fun compute_smallers_for(poe: PartialOrderElement[E], set: Set[E])

        do
                var e = poe.value
                for s in _elements do
        do
                var e = poe.value
                for s in _elements do

@@ -188,31 +188,31 @@ end
 
 class PartialOrderElement[E]
        # The partial order where belong self
 
 class PartialOrderElement[E]
        # The partial order where belong self

-       readable attr _order: PartialOrder[E] 
+       readable var _order: PartialOrder[E] 

 
        # The value handled by self
 
        # The value handled by self

-       readable attr _value: E 
+       readable var _value: E 

        
        # Current rank in the hierarchy
        # Roots have 0
        # Sons of roots have 1
        # Etc.
        
        # Current rank in the hierarchy
        # Roots have 0
        # Sons of roots have 1
        # Etc.

-       readable attr _rank: Int 
+       readable var _rank: Int 

 
        # Elements that are direclty greater than self
 
        # Elements that are direclty greater than self

-       readable attr _direct_greaters: Array[E]
+       readable var _direct_greaters: Array[E]

        
        # Elements that are direclty smallers than self
        
        # Elements that are direclty smallers than self

-       readable attr _direct_smallers: Array[E]
+       readable var _direct_smallers: Array[E]

 
        # Elements that are strictly greater than self
 
        # Elements that are strictly greater than self

-       readable attr _greaters: Set[E]
+       readable var _greaters: Set[E]

 
        # Cached result of greaters_and_self
 
        # Cached result of greaters_and_self

-       attr _greaters_and_self_cache: nullable Array[E]
+       var _greaters_and_self_cache: nullable Array[E]

 
        # Elements that are self or greater than self
 
        # Elements that are self or greater than self

-       meth greaters_and_self: Collection[E]
+       fun greaters_and_self: Collection[E]

        do
                if _greaters_and_self_cache == null then
                        _greaters_and_self_cache = _greaters.to_a
        do
                if _greaters_and_self_cache == null then
                        _greaters_and_self_cache = _greaters.to_a

@@ -222,13 +222,13 @@ class PartialOrderElement[E]
        end
        
        # Cached value of _order.length to validade smallers_cache
        end
        
        # Cached value of _order.length to validade smallers_cache

-       attr _smallers_last_length: Int = 0
+       var _smallers_last_length: Int = 0

 
        # Cached result of smallers
 
        # Cached result of smallers

-       attr _smallers_cache: Set[E]
+       var _smallers_cache: Set[E]

 
        # Elements that are strictly smaller than self
 
        # Elements that are strictly smaller than self

-       meth smallers: Collection[E]
+       fun smallers: Collection[E]

        do
                if _smallers_last_length < _order.length then
                        _order.compute_smallers_for(self, _smallers_cache)
        do
                if _smallers_last_length < _order.length then
                        _order.compute_smallers_for(self, _smallers_cache)

@@ -238,11 +238,11 @@ class PartialOrderElement[E]
        end
 
        # Cached result of linear_extension
        end
 
        # Cached result of linear_extension

-       attr _linear_extension_cache: nullable Array[E]
+       var _linear_extension_cache: nullable Array[E]

 
        # Return a linear extension of self
        # FIXME: Uses the C++ algo that is not good!
 
        # Return a linear extension of self
        # FIXME: Uses the C++ algo that is not good!

-       meth linear_extension: Array[E]
+       fun linear_extension: Array[E]

        do
                if _linear_extension_cache == null then
                        var res = new Array[E]
        do
                if _linear_extension_cache == null then
                        var res = new Array[E]

@@ -266,11 +266,11 @@ class PartialOrderElement[E]
        end
 
        # Cached result of reverse_linear_extension
        end
 
        # Cached result of reverse_linear_extension

-       attr _reverse_linear_extension_cache: nullable Array[E]
+       var _reverse_linear_extension_cache: nullable Array[E]

 
        # Return a reverse linear extension of self
        # FIXME: Uses the C++ algo that is not good!
 
        # Return a reverse linear extension of self
        # FIXME: Uses the C++ algo that is not good!

-       meth reverse_linear_extension: Array[E]
+       fun reverse_linear_extension: Array[E]

        do
                if _reverse_linear_extension_cache == null then
                        var res = new HashSet[E]
        do
                if _reverse_linear_extension_cache == null then
                        var res = new HashSet[E]

@@ -285,30 +285,30 @@ class PartialOrderElement[E]
        end
 
        # Is value < o according to order?
        end
 
        # Is value < o according to order?

-       meth <(o: E): Bool
+       fun <(o: E): Bool

        do
                return _greaters.has(o)
        end
 
        # Is value <= o according to order?
        do
                return _greaters.has(o)
        end
 
        # Is value <= o according to order?

-       meth <=(o: E): Bool
+       fun <=(o: E): Bool

        do
                return _value == o or _greaters.has(o)
        end
 
        # Is value > o according to order?
        do
                return _value == o or _greaters.has(o)
        end
 
        # Is value > o according to order?

-       meth >(o: E): Bool
+       fun >(o: E): Bool

        do
                return _order[o] < _value
        end
 
        # Is value >= o according to order?
        do
                return _order[o] < _value
        end
 
        # Is value >= o according to order?

-       meth >=(o: E): Bool
+       fun >=(o: E): Bool

        do
                return _value == o or _order[o] < _value
        end
 
        do
                return _value == o or _order[o] < _value
        end
 

-       protected meth register_direct_smallers(e: E)
+       protected fun register_direct_smallers(e: E)

        do
                _direct_smallers.add(e)
        end
        do
                _direct_smallers.add(e)
        end

diff --git a/src/metamodel/static_type.nit b/src/metamodel/static_type.nit
index 7d57090..fa9a4d8 100644 (file)
--- a/src/metamodel/static_type.nit
+++ b/src/metamodel/static_type.nit
@@ -22,17 +22,17 @@ intrude import abstractmetamodel
 
 redef class MMLocalClass
        # Cached result of get_type
 
 redef class MMLocalClass
        # Cached result of get_type

-       attr _base_type_cache: nullable MMType
+       var _base_type_cache: nullable MMType

 
        # Return the type of self for this class
 
        # Return the type of self for this class

-       meth get_type: MMType
+       fun get_type: MMType

        do
                if _base_type_cache == null then _base_type_cache = new MMTypeSimpleClass(self)
                return _base_type_cache.as(not null)
        end
 
        # Register a new ancestor
        do
                if _base_type_cache == null then _base_type_cache = new MMTypeSimpleClass(self)
                return _base_type_cache.as(not null)
        end
 
        # Register a new ancestor

-       protected meth add_ancestor(a: MMAncestor)
+       protected fun add_ancestor(a: MMAncestor)

        do
                assert not _ancestors.has_key(a.local_class)
                assert a.local_class != self
        do
                assert not _ancestors.has_key(a.local_class)
                assert a.local_class != self

@@ -40,10 +40,10 @@ redef class MMLocalClass
        end
 
        # Array of ancestor that associate each superclass with the corresponding ancestor
        end
 
        # Array of ancestor that associate each superclass with the corresponding ancestor

-       readable attr _ancestors: nullable Map[MMLocalClass, MMAncestor]
+       readable var _ancestors: nullable Map[MMLocalClass, MMAncestor]

 
        # The ancestor type for a given superclass
 
        # The ancestor type for a given superclass

-       meth ancestor(c: MMLocalClass): MMType
+       fun ancestor(c: MMLocalClass): MMType

        do
                return _ancestors[c].stype
        end
        do
                return _ancestors[c].stype
        end

@@ -51,12 +51,12 @@ end
 
 redef class MMLocalProperty
        # The signature of the property (where it is declared)
 
 redef class MMLocalProperty
        # The signature of the property (where it is declared)

-       readable writable attr _signature: nullable MMSignature
+       readable writable var _signature: nullable MMSignature

 
 

-       attr _signatures_cache: HashMap[MMType, MMSignature] = new HashMap[MMType, MMSignature]
+       var _signatures_cache: HashMap[MMType, MMSignature] = new HashMap[MMType, MMSignature]

 
        # Return the adapted signature of self for a receiver of type t
 
        # Return the adapted signature of self for a receiver of type t

-       meth signature_for(t: MMType): MMSignature do
+       fun signature_for(t: MMType): MMSignature do

                if t == local_class.get_type then return signature.as(not null)
 
                if _signatures_cache.has_key(t) then return _signatures_cache[t]
                if t == local_class.get_type then return signature.as(not null)
 
                if _signatures_cache.has_key(t) then return _signatures_cache[t]

@@ -70,25 +70,25 @@ end
 # Signature for local properties
 class MMSignature
        # The type of the reveiver
 # Signature for local properties
 class MMSignature
        # The type of the reveiver

-       readable attr _recv: MMType
+       readable var _recv: MMType

 
        # The parameter types
 
        # The parameter types

-       attr _params: Array[MMType]
+       var _params: Array[MMType]

 
        # The return type
 
        # The return type

-       readable attr _return_type: nullable MMType
+       readable var _return_type: nullable MMType

 
        # The closure parameters
 
        # The closure parameters

-       readable attr _closures: Array[MMClosure] = new Array[MMClosure]
+       readable var _closures: Array[MMClosure] = new Array[MMClosure]

 
        # Number of parameters
 
        # Number of parameters

-       meth arity: Int
+       fun arity: Int

        do
                return _params.length
        end
 
        # Is self a valid subtype of an other signature
        do
                return _params.length
        end
 
        # Is self a valid subtype of an other signature

-       meth <(s: MMSignature): Bool
+       fun <(s: MMSignature): Bool

        do
                if self == s then
                        return true
        do
                if self == s then
                        return true

@@ -115,13 +115,13 @@ class MMSignature
        end
 
        # The type of the i-th parameter
        end
 
        # The type of the i-th parameter

-       meth [](i: Int): MMType
+       fun [](i: Int): MMType

        do
                assert _params.length > i
                return _params[i]
        end
 
        do
                assert _params.length > i
                return _params[i]
        end
 

-       redef meth to_s
+       redef fun to_s

        do
                var s = new Buffer
                if _params.length > 0 then
        do
                var s = new Buffer
                if _params.length > 0 then

@@ -142,7 +142,7 @@ class MMSignature
        end
 
        # Adapt the signature to a different receiver
        end
 
        # Adapt the signature to a different receiver

-       meth adaptation_to(r: MMType): MMSignature
+       fun adaptation_to(r: MMType): MMSignature

        do
                if _recv == r then
                        return self
        do
                if _recv == r then
                        return self

@@ -163,11 +163,11 @@ class MMSignature
                return res
        end
 
                return res
        end
 

-       attr _not_for_self_cache: nullable MMSignature = null
+       var _not_for_self_cache: nullable MMSignature = null

 
        # Return a type approximation if the reveiver is not self
        # Useful for virtual types
 
        # Return a type approximation if the reveiver is not self
        # Useful for virtual types

-       meth not_for_self: MMSignature
+       fun not_for_self: MMSignature

        do
                if _not_for_self_cache != null then return _not_for_self_cache.as(not null)
 
        do
                if _not_for_self_cache != null then return _not_for_self_cache.as(not null)
 

@@ -215,18 +215,18 @@ end
 # A closure in a signature
 class MMClosure
        # The signature of the closure
 # A closure in a signature
 class MMClosure
        # The signature of the closure

-       readable attr _signature: MMSignature
+       readable var _signature: MMSignature

 
        # Is the closure a brek one
        # aka is defined with the break keyword thus does not return
 
        # Is the closure a brek one
        # aka is defined with the break keyword thus does not return

-       readable attr _is_break: Bool
+       readable var _is_break: Bool

 
        # Is the closure optional?
        # ie is there a default definition
 
        # Is the closure optional?
        # ie is there a default definition

-       readable attr _is_optional: Bool
+       readable var _is_optional: Bool

 
        # Adapt the signature to a different receiver
 
        # Adapt the signature to a different receiver

-       meth adaptation_to(r: MMType): MMClosure
+       fun adaptation_to(r: MMType): MMClosure

        do
                return new MMClosure(_signature.adaptation_to(r), _is_break, _is_optional)
        end
        do
                return new MMClosure(_signature.adaptation_to(r), _is_break, _is_optional)
        end

@@ -238,7 +238,7 @@ class MMClosure
                _is_optional = is_optional
        end
 
                _is_optional = is_optional
        end
 

-       meth not_for_self: MMClosure
+       fun not_for_self: MMClosure

        do
                var sig = _signature.not_for_self
                if sig != _signature then
        do
                var sig = _signature.not_for_self
                if sig != _signature then

@@ -248,7 +248,7 @@ class MMClosure
                end
        end
 
                end
        end
 

-       meth <(c: MMClosure): Bool
+       fun <(c: MMClosure): Bool

        do
                if c.is_optional and not is_optional then return false
                if not c.is_break and is_break then return false
        do
                if c.is_optional and not is_optional then return false
                if not c.is_break and is_break then return false

@@ -259,29 +259,29 @@ end
 # Inheritance relation between two types
 abstract class MMAncestor
        # The inherited type
 # Inheritance relation between two types
 abstract class MMAncestor
        # The inherited type

-       writable attr _stype: nullable MMType = null
+       writable var _stype: nullable MMType = null

 
        # The inherited type
 
        # The inherited type

-       meth stype: MMType do return _stype.as(not null)
+       fun stype: MMType do return _stype.as(not null)

 
        # The inheriter (heir) type
 
        # The inheriter (heir) type

-       writable attr _inheriter: nullable MMType = null
+       writable var _inheriter: nullable MMType = null

 
        # The inheriter (heir) type
 
        # The inheriter (heir) type

-       meth inheriter: MMType do return _inheriter.as(not null)
+       fun inheriter: MMType do return _inheriter.as(not null)

 
 

-       meth is_reffinement: Bool do
+       fun is_reffinement: Bool do

                return stype.module != stype.module
        end
 
                return stype.module != stype.module
        end
 

-       meth is_specialisation: Bool do
+       fun is_specialisation: Bool do

                return stype.local_class.global != inheriter.local_class.global
        end
 
        # The inherited class
                return stype.local_class.global != inheriter.local_class.global
        end
 
        # The inherited class

-       meth local_class: MMLocalClass is abstract
+       fun local_class: MMLocalClass is abstract

 
 

-       redef meth to_s
+       redef fun to_s

        do
                if _stype == null then
                        return local_class.to_s
        do
                if _stype == null then
                        return local_class.to_s

@@ -295,29 +295,29 @@ end
 # Note that static type a related to a specific module
 abstract class MMType
        # The module where self makes sence
 # Note that static type a related to a specific module
 abstract class MMType
        # The module where self makes sence

-       meth module: MMModule is abstract
+       fun module: MMModule is abstract

 
        # The local class that self direclty or indirectly refers to
 
        # The local class that self direclty or indirectly refers to

-       meth local_class: MMLocalClass is abstract
+       fun local_class: MMLocalClass is abstract

 
        # Is the type a valid one
        # For instance, circular dependency on formal types is invalid
 
        # Is the type a valid one
        # For instance, circular dependency on formal types is invalid

-       meth is_valid: Bool do return true
+       fun is_valid: Bool do return true

 
        # Is self a valid subtype of t
 
        # Is self a valid subtype of t

-       meth <(t : MMType): Bool is abstract
+       fun <(t : MMType): Bool is abstract

 
        # Is self a valid supertype of t
        # This method must be only called within definition of < if
        # a double dispatch is needed
 
        # Is self a valid supertype of t
        # This method must be only called within definition of < if
        # a double dispatch is needed

-       meth is_supertype(t: MMType): Bool is abstract
+       fun is_supertype(t: MMType): Bool is abstract

 
        # Adapt self to another module
 
        # Adapt self to another module

-       meth for_module(mod: MMModule): MMType is abstract
+       fun for_module(mod: MMModule): MMType is abstract

 
        # Get the type adapted to another receiver type
        # Useful for formal types
 
        # Get the type adapted to another receiver type
        # Useful for formal types

-       meth adapt_to(recv: MMType): MMType is abstract
+       fun adapt_to(recv: MMType): MMType is abstract

 
        # Adapt self to another local class context
        # Useful for genericity
 
        # Adapt self to another local class context
        # Useful for genericity

@@ -339,21 +339,21 @@ abstract class MMType
        # 'D'.upcast_for('C') -> 'C[Float]'
        # 'D'.upcast_for('B') -> 'C[String]'
        # 'D'.upcast_for('A') -> 'A[String]'
        # 'D'.upcast_for('C') -> 'C[Float]'
        # 'D'.upcast_for('B') -> 'C[String]'
        # 'D'.upcast_for('A') -> 'A[String]'

-       meth upcast_for(c: MMLocalClass): MMType is abstract
+       fun upcast_for(c: MMLocalClass): MMType is abstract

 
        # Return a type approximation if the reveiver is not self
        # Useful for virtual types
 
        # Return a type approximation if the reveiver is not self
        # Useful for virtual types

-       meth not_for_self: MMType do return self
+       fun not_for_self: MMType do return self

 
        # The nullable version of self (if needed)
 
        # The nullable version of self (if needed)

-       attr _as_nullable_cache: nullable MMType = null
+       var _as_nullable_cache: nullable MMType = null

 
        # IS the type can accept null?
 
        # IS the type can accept null?

-       meth is_nullable: Bool do return false
+       fun is_nullable: Bool do return false

 
        # Return the nullable version of the type
        # Noop if already nullable
 
        # Return the nullable version of the type
        # Noop if already nullable

-       meth as_nullable: MMType do
+       fun as_nullable: MMType do

                var cache = _as_nullable_cache
                if cache != null then return cache
                var res = new MMNullableType(self)
                var cache = _as_nullable_cache
                if cache != null then return cache
                var res = new MMNullableType(self)

@@ -363,53 +363,53 @@ abstract class MMType
 
        # Return the not null version of the type
        # Noop if already not null
 
        # Return the not null version of the type
        # Noop if already not null

-       meth as_notnull: MMType do return self
+       fun as_notnull: MMType do return self

 end
 
 class MMNullableType
 special MMType
 end
 
 class MMNullableType
 special MMType

-       attr _base_type: MMType
-       redef meth is_valid do return _base_type.is_valid
-       redef meth is_nullable: Bool do return true
-       redef meth as_notnull do return _base_type
-       redef meth as_nullable do return self
+       var _base_type: MMType
+       redef fun is_valid do return _base_type.is_valid
+       redef fun is_nullable: Bool do return true
+       redef fun as_notnull do return _base_type
+       redef fun as_nullable do return self

        init(t: MMType) do _base_type = t
 
        init(t: MMType) do _base_type = t
 

-       redef meth module do return _base_type.module
+       redef fun module do return _base_type.module

 
 

-       redef meth local_class do return _base_type.local_class
+       redef fun local_class do return _base_type.local_class

 
 

-       redef meth <(t)
+       redef fun <(t)

        do
                return t isa MMNullableType and _base_type < t.as_notnull
        end
 
        do
                return t isa MMNullableType and _base_type < t.as_notnull
        end
 

-       redef meth to_s
+       redef fun to_s

        do
                return "nullable {_base_type}"
        end
 
        do
                return "nullable {_base_type}"
        end
 

-       redef meth is_supertype(t)
+       redef fun is_supertype(t)

        do
                return _base_type.is_supertype(t)
        end
 
        do
                return _base_type.is_supertype(t)
        end
 

-       redef meth for_module(mod)
+       redef fun for_module(mod)

        do
                return _base_type.for_module(mod).as_nullable
        end
 
        do
                return _base_type.for_module(mod).as_nullable
        end
 

-       redef meth adapt_to(recv)
+       redef fun adapt_to(recv)

        do
                return _base_type.adapt_to(recv).as_nullable
        end
 
        do
                return _base_type.adapt_to(recv).as_nullable
        end
 

-       redef meth upcast_for(c)
+       redef fun upcast_for(c)

        do
                return _base_type.upcast_for(c)
        end
 
        do
                return _base_type.upcast_for(c)
        end
 

-       redef meth not_for_self
+       redef fun not_for_self

        do
                return _base_type.not_for_self.as_nullable
        end
        do
                return _base_type.not_for_self.as_nullable
        end

@@ -417,16 +417,16 @@ end
 
 class MMTypeClass 
 special MMType
 
 class MMTypeClass 
 special MMType

-       redef readable attr _local_class: MMLocalClass
-       redef meth module do return _local_class.module end
-       redef meth <(t) do return t.is_supertype(self)
+       redef readable var _local_class: MMLocalClass
+       redef fun module do return _local_class.module end
+       redef fun <(t) do return t.is_supertype(self)

 
 

-       redef meth to_s
+       redef fun to_s

        do
                return _local_class.to_s
        end
 
        do
                return _local_class.to_s
        end
 

-       redef meth upcast_for(c)
+       redef fun upcast_for(c)

        do
                var t: MMType = self
                if _local_class != c then
        do
                var t: MMType = self
                if _local_class != c then

@@ -443,12 +443,12 @@ end
 
 class MMTypeSimpleClass
 special MMTypeClass
 
 class MMTypeSimpleClass
 special MMTypeClass

-       redef meth is_supertype(t)
+       redef fun is_supertype(t)

        do
                return  t.local_class.cshe <= _local_class
        end
 
        do
                return  t.local_class.cshe <= _local_class
        end
 

-       redef meth for_module(mod)
+       redef fun for_module(mod)

        do
                var t: MMType = self
                if module != mod then
        do
                var t: MMType = self
                if module != mod then

@@ -457,7 +457,7 @@ special MMTypeClass
                return t
        end
 
                return t
        end
 

-       redef meth adapt_to(recv) do return self
+       redef fun adapt_to(recv) do return self

 
        init(c: MMLocalClass)
        do
 
        init(c: MMLocalClass)
        do

@@ -468,20 +468,20 @@ end
 # The type of null
 class MMTypeNone
 special MMType
 # The type of null
 class MMTypeNone
 special MMType

-       redef readable attr _module: MMModule
-       redef meth is_nullable: Bool do return true
-       redef meth <(t) do return t isa MMTypeNone or t isa MMNullableType
-       redef meth to_s do return "null"
-       redef meth is_supertype(t) do return false
-       redef meth local_class do abort
-       redef meth upcast_for(c) do abort
-       redef meth as_nullable do return self
-       redef meth as_notnull do abort
+       redef readable var _module: MMModule
+       redef fun is_nullable: Bool do return true
+       redef fun <(t) do return t isa MMTypeNone or t isa MMNullableType
+       redef fun to_s do return "null"
+       redef fun is_supertype(t) do return false
+       redef fun local_class do abort
+       redef fun upcast_for(c) do abort
+       redef fun as_nullable do return self
+       redef fun as_notnull do abort

 
        private init(m: MMModule) do _module = m
 end
 
 redef class MMModule
        # The type of null
 
        private init(m: MMModule) do _module = m
 end
 
 redef class MMModule
        # The type of null

-       readable attr _type_none: MMTypeNone = new MMTypeNone(self)
+       readable var _type_none: MMTypeNone = new MMTypeNone(self)

 end
 end

diff --git a/src/metamodel/type_formal.nit b/src/metamodel/type_formal.nit
index 5ecf49f..e214218 100644 (file)
--- a/src/metamodel/type_formal.nit
+++ b/src/metamodel/type_formal.nit
@@ -22,28 +22,28 @@ import inheritance
 
 redef class MMType
        # The type a indirect type refers to
 
 redef class MMType
        # The type a indirect type refers to

-       meth direct_type: MMType do return self
+       fun direct_type: MMType do return self

 end
 
 # Formal types are named indirect types
 class MMTypeFormal
 special MMType
 end
 
 # Formal types are named indirect types
 class MMTypeFormal
 special MMType

-       redef meth is_valid do return _bound != null and _bound.is_valid
+       redef fun is_valid do return _bound != null and _bound.is_valid

 
        # The name of the type
 
        # The name of the type

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # The type refered
 
        # The type refered

-       meth bound: MMType do return _bound.as(not null)
-       attr _bound: nullable MMType
+       fun bound: MMType do return _bound.as(not null)
+       var _bound: nullable MMType

 
 

-       redef meth <(t) do return t == self or t.is_supertype(bound)
-       redef meth is_supertype(t) do return _bound.is_supertype(t)
-       redef meth is_nullable do return _bound.is_nullable
-       redef meth direct_type do return _bound.direct_type
-       redef meth local_class do return _bound.local_class
+       redef fun <(t) do return t == self or t.is_supertype(bound)
+       redef fun is_supertype(t) do return _bound.is_supertype(t)
+       redef fun is_nullable do return _bound.is_nullable
+       redef fun direct_type do return _bound.direct_type
+       redef fun local_class do return _bound.local_class

 
 

-       redef meth to_s do return _name.to_s
+       redef fun to_s do return _name.to_s

 
        protected init(name: Symbol, bound: nullable MMType)
        do
 
        protected init(name: Symbol, bound: nullable MMType)
        do

diff --git a/src/metamodel/vararg.nit b/src/metamodel/vararg.nit
index 8a103b0..c4e1c11 100644 (file)
--- a/src/metamodel/vararg.nit
+++ b/src/metamodel/vararg.nit
@@ -22,22 +22,22 @@ import genericity
 
 redef class MMSignature
        # Position of the vararg parameter. -1 in no vararg parameter
 
 redef class MMSignature
        # Position of the vararg parameter. -1 in no vararg parameter

-       readable writable attr _vararg_rank: Int 
+       readable writable var _vararg_rank: Int 

 
        # Is there a vararg parameter in the signature?
 
        # Is there a vararg parameter in the signature?

-       meth has_vararg: Bool
+       fun has_vararg: Bool

        do
                return _vararg_rank >= 0
        end
 
        do
                return _vararg_rank >= 0
        end
 

-       redef meth adaptation_to(r)
+       redef fun adaptation_to(r)

        do
                var s = super(r)
                s.vararg_rank = _vararg_rank
                return s
        end
 
        do
                var s = super(r)
                s.vararg_rank = _vararg_rank
                return s
        end
 

-       redef meth not_for_self
+       redef fun not_for_self

        do
                var s = super
                s.vararg_rank = _vararg_rank
        do
                var s = super
                s.vararg_rank = _vararg_rank

diff --git a/src/metamodel/virtualtype.nit b/src/metamodel/virtualtype.nit
index 12a85d7..fa2b2aa 100644 (file)
--- a/src/metamodel/virtualtype.nit
+++ b/src/metamodel/virtualtype.nit
@@ -22,14 +22,14 @@ import type_formal
 
 redef class MMGlobalProperty
        # Is self a virtual type
 
 redef class MMGlobalProperty
        # Is self a virtual type

-       meth is_virtual_type: Bool do return intro isa MMTypeProperty
+       fun is_virtual_type: Bool do return intro isa MMTypeProperty

 end
 
 # Virtual type properties
 class MMTypeProperty
 special MMLocalProperty
        # The virtual static type associated
 end
 
 # Virtual type properties
 class MMTypeProperty
 special MMLocalProperty
        # The virtual static type associated

-       meth stype_for(recv: MMType): nullable MMVirtualType
+       fun stype_for(recv: MMType): nullable MMVirtualType

        do
                var prop = recv.local_class[global]
                assert prop isa MMTypeProperty
        do
                var prop = recv.local_class[global]
                assert prop isa MMTypeProperty

@@ -37,9 +37,9 @@ special MMLocalProperty
        end
 
        # Cached results of stype
        end
 
        # Cached results of stype

-       attr _stypes_cache: HashMap[MMType, MMVirtualType] = new HashMap[MMType, MMVirtualType]
+       var _stypes_cache: HashMap[MMType, MMVirtualType] = new HashMap[MMType, MMVirtualType]

 
 

-       private meth real_stype_for(recv: MMType): nullable MMVirtualType
+       private fun real_stype_for(recv: MMType): nullable MMVirtualType

        do
                # If the signature is not build: Circular definition
                if signature == null then return null
        do
                # If the signature is not build: Circular definition
                if signature == null then return null

@@ -56,10 +56,10 @@ end
 class MMVirtualType
 special MMTypeFormal
        # The property associed
 class MMVirtualType
 special MMTypeFormal
        # The property associed

-       readable attr _property: MMTypeProperty
+       readable var _property: MMTypeProperty

 
        # The receiver type
 
        # The receiver type

-       readable attr _recv: MMType
+       readable var _recv: MMType

 
        protected init(p: MMTypeProperty, recv: MMType)
        do
 
        protected init(p: MMTypeProperty, recv: MMType)
        do

@@ -68,27 +68,27 @@ special MMTypeFormal
                _recv = recv
        end
 
                _recv = recv
        end
 

-       redef meth module do return _recv.module
+       redef fun module do return _recv.module

 
 

-       redef meth for_module(mod)
+       redef fun for_module(mod)

        do
                if mod == module then return self
                return adapt_to(recv.for_module(mod))
        end
 
        do
                if mod == module then return self
                return adapt_to(recv.for_module(mod))
        end
 

-       redef meth not_for_self
+       redef fun not_for_self

        do
                return bound.not_for_self
        end
 
        do
                return bound.not_for_self
        end
 

-       redef meth adapt_to(recv)
+       redef fun adapt_to(recv)

        do
                return property.stype_for(recv).as(not null)
        end
 end
 
 redef class MMLocalClass
        do
                return property.stype_for(recv).as(not null)
        end
 end
 
 redef class MMLocalClass

-       meth virtual_type(s: Symbol): MMGlobalProperty
+       fun virtual_type(s: Symbol): MMGlobalProperty

        do
                var prop = get_property_by_name(s)
                if prop.is_virtual_type then
        do
                var prop = get_property_by_name(s)
                if prop.is_virtual_type then

@@ -98,7 +98,7 @@ redef class MMLocalClass
        end
 
        # Select a virtual type property by its name
        end
 
        # Select a virtual type property by its name

-       meth select_virtual_type(name: Symbol): MMTypeProperty
+       fun select_virtual_type(name: Symbol): MMTypeProperty

        do
                var gp = virtual_type(name)
                var res = self[gp]
        do
                var gp = virtual_type(name)
                var res = self[gp]

diff --git a/src/mmloader.nit b/src/mmloader.nit
index 6b44267..5b4a45d 100644 (file)
--- a/src/mmloader.nit
+++ b/src/mmloader.nit
@@ -25,20 +25,20 @@ import opts
 class ToolContext
 special MMContext
        # Number of errors
 class ToolContext
 special MMContext
        # Number of errors

-       readable attr _error_count: Int = 0 
+       readable var _error_count: Int = 0 

 
        # Number of warnings
 
        # Number of warnings

-       readable attr _warning_count: Int = 0
+       readable var _warning_count: Int = 0

 
        # Display an error
 
        # Display an error

-       meth error(s: String)
+       fun error(s: String)

        do
                stderr.write("{s}\n")
                _error_count = _error_count + 1
        end
 
        # Display a warning
        do
                stderr.write("{s}\n")
                _error_count = _error_count + 1
        end
 
        # Display a warning

-       meth warning(s: String)
+       fun warning(s: String)

        do
                if _opt_warn.value == 0 then return
                stderr.write("{s}\n")
        do
                if _opt_warn.value == 0 then return
                stderr.write("{s}\n")

@@ -50,34 +50,34 @@ special MMContext
        end
 
        # Paths where to locate modules files
        end
 
        # Paths where to locate modules files

-       readable attr _paths: Array[String] = new Array[String]
+       readable var _paths: Array[String] = new Array[String]

 
        # List of module loaders
 
        # List of module loaders

-       attr _loaders: Array[ModuleLoader] = new Array[ModuleLoader]
+       var _loaders: Array[ModuleLoader] = new Array[ModuleLoader]

        
        # Global OptionContext
        
        # Global OptionContext

-       readable attr _option_context: OptionContext = new OptionContext
+       readable var _option_context: OptionContext = new OptionContext

 
        # Option --warn
 
        # Option --warn

-       readable attr _opt_warn: OptionCount = new OptionCount("Show warnings", "-W", "--warn")
+       readable var _opt_warn: OptionCount = new OptionCount("Show warnings", "-W", "--warn")

 
        # Option --path
 
        # Option --path

-       readable attr _opt_path: OptionArray = new OptionArray("Set include path for loaders (may be used more than once)", "-I", "--path")
+       readable var _opt_path: OptionArray = new OptionArray("Set include path for loaders (may be used more than once)", "-I", "--path")

 
        # Option --lop
 
        # Option --lop

-       readable attr _opt_log: OptionBool = new OptionBool("Generate various log files", "--log")
+       readable var _opt_log: OptionBool = new OptionBool("Generate various log files", "--log")

        
        # Option --only-metamodel
        
        # Option --only-metamodel

-       readable attr _opt_only_metamodel: OptionBool = new OptionBool("Stop after meta-model processing", "--only-metamodel")
+       readable var _opt_only_metamodel: OptionBool = new OptionBool("Stop after meta-model processing", "--only-metamodel")

 
        # Option --only-parse
 
        # Option --only-parse

-       readable attr _opt_only_parse: OptionBool = new OptionBool("Only proceed to parse step of loaders", "--only-parse")
+       readable var _opt_only_parse: OptionBool = new OptionBool("Only proceed to parse step of loaders", "--only-parse")

 
        # Option --help
 
        # Option --help

-       readable attr _opt_help: OptionBool = new OptionBool("Show Help (This screen)", "-h", "-?", "--help")
+       readable var _opt_help: OptionBool = new OptionBool("Show Help (This screen)", "-h", "-?", "--help")

 
        # Option --version
 
        # Option --version

-       readable attr _opt_version: OptionBool = new OptionBool("Show version and exit", "--version")
+       readable var _opt_version: OptionBool = new OptionBool("Show version and exit", "--version")

 
        init
        do
 
        init
        do

@@ -86,7 +86,7 @@ special MMContext
        end
 
        # Parse and process the options given on the command line
        end
 
        # Parse and process the options given on the command line

-       meth process_options
+       fun process_options

        do
                # init options
                option_context.parse(args)
        do
                # init options
                option_context.parse(args)

@@ -112,7 +112,7 @@ special MMContext
        # Load and process a module in a directory (or a parent directory).
        # If the module is already loaded, just return it without further processing.
        # If no module is found, just return null without complaining.
        # Load and process a module in a directory (or a parent directory).
        # If the module is already loaded, just return it without further processing.
        # If no module is found, just return null without complaining.

-       private meth try_to_load(module_name: Symbol, dir: MMDirectory): nullable MMModule
+       private fun try_to_load(module_name: Symbol, dir: MMDirectory): nullable MMModule

        do
                # Look in the module directory
                for m in dir.modules do
        do
                # Look in the module directory
                for m in dir.modules do

@@ -153,12 +153,12 @@ special MMContext
 
        # List of module currently processed.
        # Used to prevent dependence loops.
 
        # List of module currently processed.
        # Used to prevent dependence loops.

-       attr _processing_modules: HashSet[Symbol] = new HashSet[Symbol]
+       var _processing_modules: HashSet[Symbol] = new HashSet[Symbol]

 
        # Locate, load and analysis a module (and its supermodules) from its file name.
        # If the module is already loaded, just return it without further processing.
        # Beware, the files are automatically considered root of their directory.
 
        # Locate, load and analysis a module (and its supermodules) from its file name.
        # If the module is already loaded, just return it without further processing.
        # Beware, the files are automatically considered root of their directory.

-       meth get_module_from_filename(filename: String): MMModule
+       fun get_module_from_filename(filename: String): MMModule

        do
                var path = filename.dirname
                var module_name = filename.basename(".nit").to_symbol
        do
                var path = filename.dirname
                var module_name = filename.basename(".nit").to_symbol

@@ -192,7 +192,7 @@ special MMContext
 
        # Locate, load and analysis a module (and its supermodules).
        # If the module is already loaded, just return it without further processing.
 
        # Locate, load and analysis a module (and its supermodules).
        # If the module is already loaded, just return it without further processing.

-       meth get_module(module_name: Symbol, from: nullable MMModule): MMModule
+       fun get_module(module_name: Symbol, from: nullable MMModule): MMModule

        do
                var m: MMModule
                if from != null then
        do
                var m: MMModule
                if from != null then

@@ -215,7 +215,7 @@ special MMContext
        end
 
        # Return the module directory associated with a given path
        end
 
        # Return the module directory associated with a given path

-       private meth directory_for(path: String): MMDirectory
+       private fun directory_for(path: String): MMDirectory

        do
                if _path_dirs.has_key(path) then return _path_dirs[path]
                var dir = new MMDirectory(path.to_symbol, path, null) 
        do
                if _path_dirs.has_key(path) then return _path_dirs[path]
                var dir = new MMDirectory(path.to_symbol, path, null) 

@@ -224,10 +224,10 @@ special MMContext
        end
 
        # Association bwtween plain path and module directories
        end
 
        # Association bwtween plain path and module directories

-       attr _path_dirs: Map[String, MMDirectory] = new HashMap[String, MMDirectory]
+       var _path_dirs: Map[String, MMDirectory] = new HashMap[String, MMDirectory]

 
        # Register a new module loader
 
        # Register a new module loader

-       meth register_loader(ml: ModuleLoader) do _loaders.add(ml)
+       fun register_loader(ml: ModuleLoader) do _loaders.add(ml)

 end
 
 # A load handler know how to load a specific module type
 end
 
 # A load handler know how to load a specific module type

@@ -236,10 +236,10 @@ class ModuleLoader
        type MODULE: MMModule
 
        # Extension that the loadhandler accepts
        type MODULE: MMModule
 
        # Extension that the loadhandler accepts

-       meth file_type: String is abstract
+       fun file_type: String is abstract

 
        # Try to load a new module directory
 
        # Try to load a new module directory

-       meth try_to_load_dir(dirname: Symbol, parent_dir: MMDirectory): nullable MMDirectory
+       fun try_to_load_dir(dirname: Symbol, parent_dir: MMDirectory): nullable MMDirectory

        do
                var fname = "{parent_dir.path}/{dirname}/"
                if not fname.file_exists then return null
        do
                var fname = "{parent_dir.path}/{dirname}/"
                if not fname.file_exists then return null

@@ -250,7 +250,7 @@ class ModuleLoader
 
        # Can the loadhandler load a given module?
        # Return the file found
 
        # Can the loadhandler load a given module?
        # Return the file found

-       meth can_handle(module_name: Symbol, dir: MMDirectory): Bool
+       fun can_handle(module_name: Symbol, dir: MMDirectory): Bool

        do
                var fname = "{dir.path}/{module_name}.{file_type}"
                if fname.file_exists then return true
        do
                var fname = "{dir.path}/{module_name}.{file_type}"
                if fname.file_exists then return true

@@ -259,7 +259,7 @@ class ModuleLoader
 
        # Load the module and process it
        # filename is the result of can_handle
 
        # Load the module and process it
        # filename is the result of can_handle

-       meth load_and_process_module(context: ToolContext, module_name: Symbol, dir: MMDirectory): MODULE
+       fun load_and_process_module(context: ToolContext, module_name: Symbol, dir: MMDirectory): MODULE

        do
                var filename = "{dir.path}/{module_name}.{file_type}"
                var m = load_module(context, module_name, dir, filename)
        do
                var filename = "{dir.path}/{module_name}.{file_type}"
                var m = load_module(context, module_name, dir, filename)

@@ -268,7 +268,7 @@ class ModuleLoader
        end
 
        # Load an parse the module
        end
 
        # Load an parse the module

-       private meth load_module(context: ToolContext, module_name: Symbol, dir: MMDirectory, filename: String): MODULE
+       private fun load_module(context: ToolContext, module_name: Symbol, dir: MMDirectory, filename: String): MODULE

        do
                var file: IFStream
                if filename == "-" then
        do
                var file: IFStream
                if filename == "-" then

@@ -288,15 +288,15 @@ class ModuleLoader
        end
 
        # Parse the file to load a module
        end
 
        # Parse the file to load a module

-       protected meth parse_file(context: ToolContext, file: IFStream, filename: String, module_name: Symbol, dir: MMDirectory): MODULE is abstract
+       protected fun parse_file(context: ToolContext, file: IFStream, filename: String, module_name: Symbol, dir: MMDirectory): MODULE is abstract

 
        # Process a parsed module
 
        # Process a parsed module

-       protected meth process_metamodel(context: ToolContext, module: MODULE) is abstract
+       protected fun process_metamodel(context: ToolContext, module: MODULE) is abstract

 end
 
 redef class MMModule
        # Recurcivelty process an import modules
 end
 
 redef class MMModule
        # Recurcivelty process an import modules

-       meth import_supers_modules(names: Collection[Symbol])
+       fun import_supers_modules(names: Collection[Symbol])

        do
                var c = context
                assert c isa ToolContext
        do
                var c = context
                assert c isa ToolContext

diff --git a/src/nitc.nit b/src/nitc.nit
index 604431e..bc788ae 100644 (file)
--- a/src/nitc.nit
+++ b/src/nitc.nit
@@ -23,14 +23,14 @@ private import compiling
 # The main class of the nitcompiler program
 class NitCompiler
 special AbstractCompiler
 # The main class of the nitcompiler program
 class NitCompiler
 special AbstractCompiler

-       readable attr _opt_output: OptionString = new OptionString("Output file", "-o", "--output")
-       readable attr _opt_boost: OptionBool = new OptionBool("Optimize compilation", "-O", "--boost")
-       readable attr _opt_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no_cc")
-       readable attr _opt_global: OptionBool = new OptionBool("Use global compilation", "--global")
-       readable attr _opt_clibdir: OptionString = new OptionString("NIT C library directory", "--clibdir")
-       readable attr _opt_bindir: OptionString = new OptionString("NIT tools directory", "--bindir")
-       readable attr _opt_compdir: OptionString = new OptionString("Intermediate compilation directory", "--compdir")
-       readable attr _opt_extension_prefix: OptionString = new OptionString("Append prefix to file extension", "-p", "--extension-prefix")
+       readable var _opt_output: OptionString = new OptionString("Output file", "-o", "--output")
+       readable var _opt_boost: OptionBool = new OptionBool("Optimize compilation", "-O", "--boost")
+       readable var _opt_no_cc: OptionBool = new OptionBool("Do not invoke C compiler", "--no_cc")
+       readable var _opt_global: OptionBool = new OptionBool("Use global compilation", "--global")
+       readable var _opt_clibdir: OptionString = new OptionString("NIT C library directory", "--clibdir")
+       readable var _opt_bindir: OptionString = new OptionString("NIT tools directory", "--bindir")
+       readable var _opt_compdir: OptionString = new OptionString("Intermediate compilation directory", "--compdir")
+       readable var _opt_extension_prefix: OptionString = new OptionString("Append prefix to file extension", "-p", "--extension-prefix")

 
        init
        do
 
        init
        do

@@ -38,7 +38,7 @@ special AbstractCompiler
                option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix)
        end
 
                option_context.add_option(opt_output, opt_boost, opt_no_cc, opt_global, opt_clibdir, opt_bindir, opt_compdir, opt_extension_prefix)
        end
 

-       redef meth process_options
+       redef fun process_options

        do
                super
                output_file = opt_output.value
        do
                super
                output_file = opt_output.value

@@ -92,7 +92,7 @@ special AbstractCompiler
                end
        end
 
                end
        end
 

-       redef meth perform_work(mods)
+       redef fun perform_work(mods)

        do
                for mod in mods do
                        assert mod isa MMSrcModule
        do
                for mod in mods do
                        assert mod isa MMSrcModule

diff --git a/src/nitdoc.nit b/src/nitdoc.nit
index 18e1d0c..5434df0 100644 (file)
--- a/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@ -26,25 +26,25 @@ import abstracttool
 class DocContext
 special AbstractCompiler
        # Destination directory
 class DocContext
 special AbstractCompiler
        # Destination directory

-       readable writable attr _dir: String = "."
+       readable writable var _dir: String = "."

 
        # Content of a generated file
 
        # Content of a generated file

-       attr _stage_context: StageContext = new StageContext(null)
+       var _stage_context: StageContext = new StageContext(null)

 
        # Add a string in the content
 
        # Add a string in the content

-       meth add(s: String) do
+       fun add(s: String) do

                _stage_context.content.add(s)
                _stage_context.validate = true
        end
 
        # Add a string in the content iff some other string are added
                _stage_context.content.add(s)
                _stage_context.validate = true
        end
 
        # Add a string in the content iff some other string are added

-       meth stage(s: String) do _stage_context.content.add(s)
+       fun stage(s: String) do _stage_context.content.add(s)

 
        # Create a new stage in the content
 
        # Create a new stage in the content

-       meth open_stage do _stage_context = new StageContext(_stage_context)
+       fun open_stage do _stage_context = new StageContext(_stage_context)

 
        # Close the current stage in the content
 
        # Close the current stage in the content

-       meth close_stage
+       fun close_stage

        do
                var s = _stage_context.parent
                if _stage_context.validate then
        do
                var s = _stage_context.parent
                if _stage_context.validate then

@@ -56,7 +56,7 @@ special AbstractCompiler
        end
 
        # Write the content to a new file
        end
 
        # Write the content to a new file

-       meth write_to(filename: String)
+       fun write_to(filename: String)

        do
                print "Generate {filename}"
                var f = new OFStream.open(filename)
        do
                print "Generate {filename}"
                var f = new OFStream.open(filename)

@@ -67,19 +67,19 @@ special AbstractCompiler
        end
 
        # Currently computed module
        end
 
        # Currently computed module

-       readable attr _module: nullable MMSrcModule
+       readable var _module: nullable MMSrcModule

 
        # Is the current directory module computed as a simple modude ?
 
        # Is the current directory module computed as a simple modude ?

-       readable writable attr _inside_mode: Bool = false
+       readable writable var _inside_mode: Bool = false

 
        # Is the current module computed as a intruded one ?
 
        # Is the current module computed as a intruded one ?

-       readable writable attr _intrude_mode: Bool = false
+       readable writable var _intrude_mode: Bool = false

 
        # Compued introducing entities (for the index)
 
        # Compued introducing entities (for the index)

-       attr _entities: Array[MMEntity] = new Array[MMEntity]
+       var _entities: Array[MMEntity] = new Array[MMEntity]

 
        # Register an entity (for the index)
 
        # Register an entity (for the index)

-       meth register(e: MMEntity)
+       fun register(e: MMEntity)

        do
                _entities.add(e)
                if e isa MMSrcModule then
        do
                _entities.add(e)
                if e isa MMSrcModule then

@@ -88,13 +88,13 @@ special AbstractCompiler
        end
 
        # Start a new file
        end
 
        # Start a new file

-       meth clear
+       fun clear

        do
                _stage_context = new StageContext(null)
        end
 
        # Generate common files (frames, index, overview)
        do
                _stage_context = new StageContext(null)
        end
 
        # Generate common files (frames, index, overview)

-       meth extract_other_doc
+       fun extract_other_doc

        do
                _module = null
                inside_mode = false
        do
                _module = null
                inside_mode = false

@@ -180,7 +180,7 @@ special AbstractCompiler
                write_to("{dir}/index.html")
        end
 
                write_to("{dir}/index.html")
        end
 

-       meth add_header(title: String)
+       fun add_header(title: String)

        do
                add("<html><head><title>{title}</title></head>\n<body>\n")
                add("<table border=\"0\" width=\"100%\" cellpadding=\"1\" cellspacing=\"0\"><tr><td bgcolor=\"#eeeeff\">\n")
        do
                add("<html><head><title>{title}</title></head>\n<body>\n")
                add("<table border=\"0\" width=\"100%\" cellpadding=\"1\" cellspacing=\"0\"><tr><td bgcolor=\"#eeeeff\">\n")

@@ -208,19 +208,19 @@ special AbstractCompiler
        end
 
        # Sorter of entities in alphabetical order
        end
 
        # Sorter of entities in alphabetical order

-       attr _sorter: AlphaSorter[MMEntity] = new AlphaSorter[MMEntity]
+       var _sorter: AlphaSorter[MMEntity] = new AlphaSorter[MMEntity]

 
        # Sort entities in the alphabetical order
 
        # Sort entities in the alphabetical order

-       meth sort(array: Array[MMEntity])
+       fun sort(array: Array[MMEntity])

        do
                _sorter.sort(array)
        end
 
        do
                _sorter.sort(array)
        end
 

-       readable writable attr _owned_modules: Array[MMModule] = new Array[MMModule]
+       readable writable var _owned_modules: Array[MMModule] = new Array[MMModule]

 
        # Return the known_owner for current module
        # if inside_mode is set, it could be a different result
 
        # Return the known_owner for current module
        # if inside_mode is set, it could be a different result

-       meth known_owner_of(m: MMModule): MMModule
+       fun known_owner_of(m: MMModule): MMModule

        do
                var module = module
                if module == null then return m
        do
                var module = module
                if module == null then return m

@@ -232,9 +232,9 @@ special AbstractCompiler
                end
        end
 
                end
        end
 

-       readable attr _opt_dir: OptionString = new OptionString("Directory where doc is generated", "-d", "--dir")
+       readable var _opt_dir: OptionString = new OptionString("Directory where doc is generated", "-d", "--dir")

 
 

-       redef meth perform_work(mods)
+       redef fun perform_work(mods)

        do
                dir.mkdir
 
        do
                dir.mkdir
 

@@ -251,7 +251,7 @@ special AbstractCompiler
                option_context.add_option(opt_dir)
        end
 
                option_context.add_option(opt_dir)
        end
 

-       redef meth process_options
+       redef fun process_options

        do
                super
                var d = opt_dir.value
        do
                super
                var d = opt_dir.value

@@ -262,13 +262,13 @@ end
 # Conditionnal part of the text content of a DocContext
 class StageContext
        # Content of the current stage
 # Conditionnal part of the text content of a DocContext
 class StageContext
        # Content of the current stage

-       readable attr _content: Array[String] = new Array[String]
+       readable var _content: Array[String] = new Array[String]

 
        # Is a normal string already added?
 
        # Is a normal string already added?

-       readable writable attr _validate: Bool = false
+       readable writable var _validate: Bool = false

 
        # Parent stage is any
 
        # Parent stage is any

-       readable attr _parent: nullable StageContext = null
+       readable var _parent: nullable StageContext = null

 
        init(parent: nullable StageContext) do _parent = parent
 end
 
        init(parent: nullable StageContext) do _parent = parent
 end

@@ -277,7 +277,7 @@ end
 # Efficiently sort object with their to_s method
 class AlphaSorter[E: Object]
 special AbstractSorter[E]
 # Efficiently sort object with their to_s method
 class AlphaSorter[E: Object]
 special AbstractSorter[E]

-       redef meth compare(a, b)
+       redef fun compare(a, b)

        do
                var sa: String
                var sb: String
        do
                var sa: String
                var sb: String

@@ -298,7 +298,7 @@ special AbstractSorter[E]
        end
 
        # Keep track of to_s values
        end
 
        # Keep track of to_s values

-       attr _dico: HashMap[Object, String] = new HashMap[Object, String]
+       var _dico: HashMap[Object, String] = new HashMap[Object, String]

 
        init do end
 end
 
        init do end
 end

@@ -306,42 +306,42 @@ end
 # Generalization of metamodel entities
 class MMEntity
        # Return a link to
 # Generalization of metamodel entities
 class MMEntity
        # Return a link to

-       meth html_link(dctx: DocContext): String is abstract
+       fun html_link(dctx: DocContext): String is abstract

 
        # Is the entity should appear in the generaed doc
 
        # Is the entity should appear in the generaed doc

-       meth need_doc(dctx: DocContext): Bool is abstract
+       fun need_doc(dctx: DocContext): Bool is abstract

 
        # Return a one liner description
 
        # Return a one liner description

-       meth short_doc: String do return "&nbsp;"
+       fun short_doc: String do return "&nbsp;"

 
        # The doc node from the AST
        # Return null is none
 
        # The doc node from the AST
        # Return null is none

-       meth doc: nullable ADoc do return null
+       fun doc: nullable ADoc do return null

 
        # Human redable location of the entity (module/class/property)
 
        # Human redable location of the entity (module/class/property)

-       meth locate(dctx: DocContext): String do return ""
+       fun locate(dctx: DocContext): String do return ""

 
        # Part of the prototype before the name (kind, modifiers, qualifier)
 
        # Part of the prototype before the name (kind, modifiers, qualifier)

-       meth prototype_head(dctx: DocContext): String is abstract
+       fun prototype_head(dctx: DocContext): String is abstract

 
        # Part of the property after the name (signature, modifiers)
 
        # Part of the property after the name (signature, modifiers)

-       meth prototype_body(dctx: DocContext): String do return ""
+       fun prototype_body(dctx: DocContext): String do return ""

 end
 
 redef class MMModule
 special MMEntity
 end
 
 redef class MMModule
 special MMEntity

-       redef meth html_link(dctx) do 
+       redef fun html_link(dctx) do 

                if dctx.module == self then 
                        return "{self}"
                else
                        return "<a href=\"{self}.html\">{self}</a>"
                end
        end
                if dctx.module == self then 
                        return "{self}"
                else
                        return "<a href=\"{self}.html\">{self}</a>"
                end
        end

-       redef meth need_doc(dctx) do return true
-       redef meth prototype_head(dctx) do return "module "
+       redef fun need_doc(dctx) do return true
+       redef fun prototype_head(dctx) do return "module "

 
 

-       attr _known_owner_of_cache: Map[MMModule, MMModule] = new HashMap[MMModule, MMModule]
-       meth known_owner_of(module: MMModule): MMModule
+       var _known_owner_of_cache: Map[MMModule, MMModule] = new HashMap[MMModule, MMModule]
+       fun known_owner_of(module: MMModule): MMModule

        do 
                if _known_owner_of_cache.has_key(module) then return _known_owner_of_cache[module]
                var res = module
        do 
                if _known_owner_of_cache.has_key(module) then return _known_owner_of_cache[module]
                var res = module

@@ -355,7 +355,7 @@ special MMEntity
        end
 
        # Return the most general module that own self
        end
 
        # Return the most general module that own self

-       meth owner(from: MMModule): MMModule
+       fun owner(from: MMModule): MMModule

        do
                var res = self
                var d: nullable MMDirectory = directory
        do
                var res = self
                var d: nullable MMDirectory = directory

@@ -367,7 +367,7 @@ special MMEntity
                return res
        end
 
                return res
        end
 

-       private meth known_owner_of_intern(module: MMModule, from: MMModule, as_owner: Bool): MMModule
+       private fun known_owner_of_intern(module: MMModule, from: MMModule, as_owner: Bool): MMModule

        do
                if module == self then return self
                var candidates = new Array[MMModule]
        do
                if module == self then return self
                var candidates = new Array[MMModule]

@@ -393,12 +393,12 @@ end
 redef class MMLocalProperty
 special MMEntity
        # Anchor of the property description in the module html file
 redef class MMLocalProperty
 special MMEntity
        # Anchor of the property description in the module html file

-       meth html_anchor: String
+       fun html_anchor: String

        do
                return "PROP_{local_class}_{cmangle(name)}"
        end
 
        do
                return "PROP_{local_class}_{cmangle(name)}"
        end
 

-       redef meth html_link(dctx)
+       redef fun html_link(dctx)

        do
                var m = module
                if not need_doc(dctx) then m = global.intro.module
        do
                var m = module
                if not need_doc(dctx) then m = global.intro.module

@@ -410,22 +410,22 @@ special MMEntity
                end
        end
        
                end
        end
        

-       # Kind of property (meth, attr, etc.)
-       meth kind: String is abstract
+       # Kind of property (fun, attr, etc.)
+       fun kind: String is abstract

 
 

-       redef meth locate(dctx)
+       redef fun locate(dctx)

        do
                return "in {module.html_link(dctx)}::{local_class.html_link(dctx)}"
        end
 
        do
                return "in {module.html_link(dctx)}::{local_class.html_link(dctx)}"
        end
 

-       meth known_intro_class(dctx: DocContext): MMLocalClass
+       fun known_intro_class(dctx: DocContext): MMLocalClass

        do
                var mod = dctx.known_owner_of(global.intro.local_class.module)
                var cla = mod[global.intro.local_class.global]
                return cla
        end
 
        do
                var mod = dctx.known_owner_of(global.intro.local_class.module)
                var cla = mod[global.intro.local_class.global]
                return cla
        end
 

-       redef meth prototype_head(dctx)
+       redef fun prototype_head(dctx)

        do
                var res = new Buffer
                var intro_class = known_intro_class(dctx)
        do
                var res = new Buffer
                var intro_class = known_intro_class(dctx)

@@ -449,7 +449,7 @@ special MMEntity
                return res.to_s
        end
 
                return res.to_s
        end
 

-       redef meth prototype_body(dctx)
+       redef fun prototype_body(dctx)

        do
                var res = new Buffer
                res.append(signature.to_html(dctx))
        do
                var res = new Buffer
                res.append(signature.to_html(dctx))

@@ -464,7 +464,7 @@ special MMEntity
                return res.to_s
        end
 
                return res.to_s
        end
 

-       redef meth need_doc(dctx)
+       redef fun need_doc(dctx)

        do
                if global.visibility_level >= 3 or self isa MMAttribute then
                        if not dctx.intrude_mode then return false
        do
                if global.visibility_level >= 3 or self isa MMAttribute then
                        if not dctx.intrude_mode then return false

@@ -476,7 +476,7 @@ special MMEntity
                return doc != null
        end
 
                return doc != null
        end
 

-       redef meth short_doc
+       redef fun short_doc

        do
                var d = doc
                if d != null then
        do
                var d = doc
                if d != null then

@@ -488,7 +488,7 @@ special MMEntity
                end
        end
        
                end
        end
        

-       redef meth doc
+       redef fun doc

        do
                var n = node
                if n == null or not node isa PPropdef then
        do
                var n = node
                if n == null or not node isa PPropdef then

@@ -508,18 +508,18 @@ special MMEntity
        end
 end
 redef class MMMethod
        end
 end
 redef class MMMethod

-       redef meth kind do return if global.is_init then "init" else "meth"
+       redef fun kind do return if global.is_init then "init" else "meth"

 end
 redef class MMAttribute
 end
 redef class MMAttribute

-       redef meth kind do return "attr"
+       redef fun kind do return "attr"

 end
 redef class MMTypeProperty
 end
 redef class MMTypeProperty

-       redef meth kind do return "type"
+       redef fun kind do return "type"

 end
 
 redef class MMSrcModule
        # Extract and generate html file for the module
 end
 
 redef class MMSrcModule
        # Extract and generate html file for the module

-       meth extract_module_doc(dctx: DocContext)
+       fun extract_module_doc(dctx: DocContext)

        do
                dctx.register(self)
 
        do
                dctx.register(self)
 

@@ -542,7 +542,7 @@ redef class MMSrcModule
                end
        end
 
                end
        end
 

-       meth extract_module_doc_inside(dctx: DocContext)
+       fun extract_module_doc_inside(dctx: DocContext)

        do
                dctx.add_header("Module {self}")
                dctx.add("<h1>Module {self}</h1>\n<dl>")
        do
                dctx.add_header("Module {self}")
                dctx.add("<h1>Module {self}</h1>\n<dl>")

@@ -641,7 +641,7 @@ redef class MMSrcModule
                dctx.add("</body></html>\n")
        end
 
                dctx.add("</body></html>\n")
        end
 

-       redef meth short_doc
+       redef fun short_doc

        do
                var d = doc
                if d != null then
        do
                var d = doc
                if d != null then

@@ -651,7 +651,7 @@ redef class MMSrcModule
                end
        end
 
                end
        end
 

-       redef meth doc
+       redef fun doc

        do
                var n = node
                if n.n_packagedecl == null then
        do
                var n = node
                if n.n_packagedecl == null then

@@ -674,7 +674,7 @@ end
 
 redef class ADoc
        # Html transcription of the doc
 
 redef class ADoc
        # Html transcription of the doc

-       meth to_html: String
+       fun to_html: String

        do
                var res = new Buffer
                for c in n_comment do
        do
                var res = new Buffer
                for c in n_comment do

@@ -684,7 +684,7 @@ redef class ADoc
        end
 
        # Oneliner transcription of the doc
        end
 
        # Oneliner transcription of the doc

-       meth short: String
+       fun short: String

        do
                return n_comment.first.text.substring_from(1)
        end
        do
                return n_comment.first.text.substring_from(1)
        end

@@ -693,9 +693,9 @@ end
 redef class MMLocalClass
 special MMEntity
        # Anchor of the class description in the module html file
 redef class MMLocalClass
 special MMEntity
        # Anchor of the class description in the module html file

-       meth html_anchor: String do return "CLASS_{self}"
+       fun html_anchor: String do return "CLASS_{self}"

 
 

-       redef meth html_link(dctx)
+       redef fun html_link(dctx)

        do
                var m = module
                if not need_doc(dctx) then m = global.module
        do
                var m = module
                if not need_doc(dctx) then m = global.module

@@ -707,11 +707,11 @@ special MMEntity
                end
        end
 
                end
        end
 

-       redef meth short_doc do return global.intro.short_doc
+       redef fun short_doc do return global.intro.short_doc

 
 

-       redef meth doc do return global.intro.doc
+       redef fun doc do return global.intro.doc

 
 

-       redef meth need_doc(dctx) do
+       redef fun need_doc(dctx) do

                if module == dctx.module then
                        for m in dctx.owned_modules do
                                if m.global_classes.has(global) then
                if module == dctx.module then
                        for m in dctx.owned_modules do
                                if m.global_classes.has(global) then

@@ -723,11 +723,11 @@ special MMEntity
                return false
        end
 
                return false
        end
 

-       redef meth locate(dctx) do return "in {module.html_link(dctx)}"
+       redef fun locate(dctx) do return "in {module.html_link(dctx)}"

 
 

-       meth known_intro(dctx: DocContext): MMLocalClass do return dctx.known_owner_of(global.intro.module)[global]
+       fun known_intro(dctx: DocContext): MMLocalClass do return dctx.known_owner_of(global.intro.module)[global]

 
 

-       redef meth prototype_head(dctx)
+       redef fun prototype_head(dctx)

        do
                var res = new Buffer
                var ki = known_intro(dctx)
        do
                var res = new Buffer
                var ki = known_intro(dctx)

@@ -739,7 +739,7 @@ special MMEntity
                return res.to_s
        end
 
                return res.to_s
        end
 

-       redef meth prototype_body(dctx)
+       redef fun prototype_body(dctx)

        do
                var res = new Buffer
                if arity > 0 then
        do
                var res = new Buffer
                if arity > 0 then

@@ -756,7 +756,7 @@ special MMEntity
        end
 
        # Extract the doc of a class
        end
 
        # Extract the doc of a class

-       meth extract_class_doc(dctx: DocContext)
+       fun extract_class_doc(dctx: DocContext)

        do
                dctx.add("<a name=\"{html_anchor}\"></a><h2>{self}</h2><small>{module.html_link(dctx)}::</small><br/>{prototype_head(dctx)}<b>{self}</b>{prototype_body(dctx)}\n")
                dctx.add("<blockquote>\n")
        do
                dctx.add("<a name=\"{html_anchor}\"></a><h2>{self}</h2><small>{module.html_link(dctx)}::</small><br/>{prototype_head(dctx)}<b>{self}</b>{prototype_body(dctx)}\n")
                dctx.add("<blockquote>\n")

@@ -842,13 +842,13 @@ special MMEntity
                dctx.add("</blockquote><hr/>\n")
        end
 
                dctx.add("</blockquote><hr/>\n")
        end
 

-       meth pass_name(pass: Int): String
+       fun pass_name(pass: Int): String

        do
                var names = once ["Virtual Types", "Consructors", "Methods", "Attributes"]
                return names[pass]
        end
        
        do
                var names = once ["Virtual Types", "Consructors", "Methods", "Attributes"]
                return names[pass]
        end
        

-       meth accept_prop(p: MMLocalProperty, pass: Int): Bool
+       fun accept_prop(p: MMLocalProperty, pass: Int): Bool

        do
                if pass == 0 then
                        return p isa MMTypeProperty
        do
                if pass == 0 then
                        return p isa MMTypeProperty

@@ -862,7 +862,7 @@ special MMEntity
                abort
        end
 
                abort
        end
 

-       meth property_summary(dctx: DocContext, pass: Int): Array[MMLocalProperty]
+       fun property_summary(dctx: DocContext, pass: Int): Array[MMLocalProperty]

        do
                var passname = pass_name(pass)
                dctx.open_stage
        do
                var passname = pass_name(pass)
                dctx.open_stage

@@ -1006,7 +1006,7 @@ special MMEntity
                return new_props
        end
 
                return new_props
        end
 

-       meth property_detail(dctx: DocContext, pass: Int, new_props: Array[MMLocalProperty])
+       fun property_detail(dctx: DocContext, pass: Int, new_props: Array[MMLocalProperty])

        do
                var passname = pass_name(pass)
                dctx.open_stage
        do
                var passname = pass_name(pass)
                dctx.open_stage

@@ -1034,7 +1034,7 @@ special MMEntity
        end
 
        # Add rows for properties inheriterd to some heirs
        end
 
        # Add rows for properties inheriterd to some heirs

-       meth properties_inherited_from(dctx: DocContext, heir: MMLocalClass, pass: Int)
+       fun properties_inherited_from(dctx: DocContext, heir: MMLocalClass, pass: Int)

        do
                var properties = new Array[String]
                for g in global_properties do
        do
                var properties = new Array[String]
                for g in global_properties do

@@ -1056,7 +1056,7 @@ special MMEntity
 end
 
 redef class MMSrcLocalClass
 end
 
 redef class MMSrcLocalClass

-       redef meth short_doc
+       redef fun short_doc

        do
                var d = doc
                if d != null then
        do
                var d = doc
                if d != null then

@@ -1069,7 +1069,7 @@ redef class MMSrcLocalClass
                end
        end
 
                end
        end
 

-       redef meth doc
+       redef fun doc

        do
                var n = nodes.first
                if not n isa AClassdef then
        do
                var n = nodes.first
                if not n isa AClassdef then

@@ -1088,7 +1088,7 @@ redef class MMSrcLocalClass
                end
        end
 
                end
        end
 

-       redef meth need_doc(dctx)
+       redef fun need_doc(dctx)

        do
                if global.visibility_level >= 3 then
                        if not dctx.intrude_mode then return false
        do
                if global.visibility_level >= 3 then
                        if not dctx.intrude_mode then return false

@@ -1108,7 +1108,7 @@ end
 
 redef class MMSignature
        # Htlm transcription of the signature (with nested links)
 
 redef class MMSignature
        # Htlm transcription of the signature (with nested links)

-       meth to_html(dctx: DocContext): String
+       fun to_html(dctx: DocContext): String

        do
                var res = new Buffer
                if arity > 0 then
        do
                var res = new Buffer
                if arity > 0 then

@@ -1130,15 +1130,15 @@ end
 
 redef class MMType
        # Htlm transcription of the type (with nested links)
 
 redef class MMType
        # Htlm transcription of the type (with nested links)

-       meth html_link(dctx: DocContext): String do return to_s
+       fun html_link(dctx: DocContext): String do return to_s

 end
 
 redef class MMTypeSimpleClass
 end
 
 redef class MMTypeSimpleClass

-       redef meth html_link(dctx) do return local_class.html_link(dctx)
+       redef fun html_link(dctx) do return local_class.html_link(dctx)

 end
 
 redef class MMTypeGeneric
 end
 
 redef class MMTypeGeneric

-       redef meth html_link(dctx)
+       redef fun html_link(dctx)

        do
                var res = new Buffer
                res.append(local_class.html_link(dctx))
        do
                var res = new Buffer
                res.append(local_class.html_link(dctx))

diff --git a/src/parser/lexer.nit b/src/parser/lexer.nit
index 93a8371..2949034 100644 (file)
--- a/src/parser/lexer.nit
+++ b/src/parser/lexer.nit
@@ -5,20 +5,20 @@ package lexer
 import parser_nodes
 
 redef class Token
 import parser_nodes
 
 redef class Token

-    readable writable attr _text: String 
-    readable attr _filename: String 
-    readable attr _line: Int 
-    readable attr _pos: Int 
+    readable writable var _text: String 
+    readable var _filename: String 
+    readable var _line: Int 
+    readable var _pos: Int 

     
     

-    meth parser_index: Int is abstract
+    fun parser_index: Int is abstract

 
 

-    redef meth to_s: String do
+    redef fun to_s: String do

         return "'{_text}'"
     end
 end
 
 redef class TEol
         return "'{_text}'"
     end
 end
 
 redef class TEol

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 0
     end
     do
        return 0
     end

@@ -33,7 +33,7 @@ redef class TEol
 end
 
 redef class TComment
 end
 
 redef class TComment

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 1
     end
     do
        return 1
     end

@@ -48,7 +48,7 @@ redef class TComment
 end
 
 redef class TKwpackage
 end
 
 redef class TKwpackage

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 2
     end
     do
        return 2
     end

@@ -63,7 +63,7 @@ redef class TKwpackage
 end
 
 redef class TKwimport
 end
 
 redef class TKwimport

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 3
     end
     do
        return 3
     end

@@ -78,7 +78,7 @@ redef class TKwimport
 end
 
 redef class TKwclass
 end
 
 redef class TKwclass

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 4
     end
     do
        return 4
     end

@@ -93,7 +93,7 @@ redef class TKwclass
 end
 
 redef class TKwabstract
 end
 
 redef class TKwabstract

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 5
     end
     do
        return 5
     end

@@ -108,7 +108,7 @@ redef class TKwabstract
 end
 
 redef class TKwinterface
 end
 
 redef class TKwinterface

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 6
     end
     do
        return 6
     end

@@ -123,7 +123,7 @@ redef class TKwinterface
 end
 
 redef class TKwuniversal
 end
 
 redef class TKwuniversal

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 7
     end
     do
        return 7
     end

@@ -138,7 +138,7 @@ redef class TKwuniversal
 end
 
 redef class TKwspecial
 end
 
 redef class TKwspecial

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 8
     end
     do
        return 8
     end

@@ -153,7 +153,7 @@ redef class TKwspecial
 end
 
 redef class TKwend
 end
 
 redef class TKwend

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 9
     end
     do
        return 9
     end

@@ -168,7 +168,7 @@ redef class TKwend
 end
 
 redef class TKwmeth
 end
 
 redef class TKwmeth

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 10
     end
     do
        return 10
     end

@@ -183,7 +183,7 @@ redef class TKwmeth
 end
 
 redef class TKwtype
 end
 
 redef class TKwtype

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 11
     end
     do
        return 11
     end

@@ -198,7 +198,7 @@ redef class TKwtype
 end
 
 redef class TKwattr
 end
 
 redef class TKwattr

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 12
     end
     do
        return 12
     end

@@ -213,7 +213,7 @@ redef class TKwattr
 end
 
 redef class TKwinit
 end
 
 redef class TKwinit

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 13
     end
     do
        return 13
     end

@@ -228,7 +228,7 @@ redef class TKwinit
 end
 
 redef class TKwredef
 end
 
 redef class TKwredef

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 14
     end
     do
        return 14
     end

@@ -243,7 +243,7 @@ redef class TKwredef
 end
 
 redef class TKwis
 end
 
 redef class TKwis

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 15
     end
     do
        return 15
     end

@@ -258,7 +258,7 @@ redef class TKwis
 end
 
 redef class TKwdo
 end
 
 redef class TKwdo

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 16
     end
     do
        return 16
     end

@@ -273,7 +273,7 @@ redef class TKwdo
 end
 
 redef class TKwreadable
 end
 
 redef class TKwreadable

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 17
     end
     do
        return 17
     end

@@ -288,7 +288,7 @@ redef class TKwreadable
 end
 
 redef class TKwwritable
 end
 
 redef class TKwwritable

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 18
     end
     do
        return 18
     end

@@ -303,7 +303,7 @@ redef class TKwwritable
 end
 
 redef class TKwvar
 end
 
 redef class TKwvar

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 19
     end
     do
        return 19
     end

@@ -318,7 +318,7 @@ redef class TKwvar
 end
 
 redef class TKwintern
 end
 
 redef class TKwintern

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 20
     end
     do
        return 20
     end

@@ -333,7 +333,7 @@ redef class TKwintern
 end
 
 redef class TKwextern
 end
 
 redef class TKwextern

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 21
     end
     do
        return 21
     end

@@ -348,7 +348,7 @@ redef class TKwextern
 end
 
 redef class TKwprotected
 end
 
 redef class TKwprotected

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 22
     end
     do
        return 22
     end

@@ -363,7 +363,7 @@ redef class TKwprotected
 end
 
 redef class TKwprivate
 end
 
 redef class TKwprivate

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 23
     end
     do
        return 23
     end

@@ -378,7 +378,7 @@ redef class TKwprivate
 end
 
 redef class TKwintrude
 end
 
 redef class TKwintrude

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 24
     end
     do
        return 24
     end

@@ -393,7 +393,7 @@ redef class TKwintrude
 end
 
 redef class TKwif
 end
 
 redef class TKwif

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 25
     end
     do
        return 25
     end

@@ -408,7 +408,7 @@ redef class TKwif
 end
 
 redef class TKwthen
 end
 
 redef class TKwthen

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 26
     end
     do
        return 26
     end

@@ -423,7 +423,7 @@ redef class TKwthen
 end
 
 redef class TKwelse
 end
 
 redef class TKwelse

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 27
     end
     do
        return 27
     end

@@ -438,7 +438,7 @@ redef class TKwelse
 end
 
 redef class TKwwhile
 end
 
 redef class TKwwhile

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 28
     end
     do
        return 28
     end

@@ -453,7 +453,7 @@ redef class TKwwhile
 end
 
 redef class TKwfor
 end
 
 redef class TKwfor

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 29
     end
     do
        return 29
     end

@@ -468,7 +468,7 @@ redef class TKwfor
 end
 
 redef class TKwin
 end
 
 redef class TKwin

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 30
     end
     do
        return 30
     end

@@ -483,7 +483,7 @@ redef class TKwin
 end
 
 redef class TKwand
 end
 
 redef class TKwand

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 31
     end
     do
        return 31
     end

@@ -498,7 +498,7 @@ redef class TKwand
 end
 
 redef class TKwor
 end
 
 redef class TKwor

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 32
     end
     do
        return 32
     end

@@ -513,7 +513,7 @@ redef class TKwor
 end
 
 redef class TKwnot
 end
 
 redef class TKwnot

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 33
     end
     do
        return 33
     end

@@ -528,7 +528,7 @@ redef class TKwnot
 end
 
 redef class TKwreturn
 end
 
 redef class TKwreturn

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 34
     end
     do
        return 34
     end

@@ -543,7 +543,7 @@ redef class TKwreturn
 end
 
 redef class TKwcontinue
 end
 
 redef class TKwcontinue

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 35
     end
     do
        return 35
     end

@@ -558,7 +558,7 @@ redef class TKwcontinue
 end
 
 redef class TKwbreak
 end
 
 redef class TKwbreak

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 36
     end
     do
        return 36
     end

@@ -573,7 +573,7 @@ redef class TKwbreak
 end
 
 redef class TKwabort
 end
 
 redef class TKwabort

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 37
     end
     do
        return 37
     end

@@ -588,7 +588,7 @@ redef class TKwabort
 end
 
 redef class TKwassert
 end
 
 redef class TKwassert

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 38
     end
     do
        return 38
     end

@@ -603,7 +603,7 @@ redef class TKwassert
 end
 
 redef class TKwnew
 end
 
 redef class TKwnew

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 39
     end
     do
        return 39
     end

@@ -618,7 +618,7 @@ redef class TKwnew
 end
 
 redef class TKwisa
 end
 
 redef class TKwisa

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 40
     end
     do
        return 40
     end

@@ -633,7 +633,7 @@ redef class TKwisa
 end
 
 redef class TKwonce
 end
 
 redef class TKwonce

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 41
     end
     do
        return 41
     end

@@ -648,7 +648,7 @@ redef class TKwonce
 end
 
 redef class TKwsuper
 end
 
 redef class TKwsuper

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 42
     end
     do
        return 42
     end

@@ -663,7 +663,7 @@ redef class TKwsuper
 end
 
 redef class TKwself
 end
 
 redef class TKwself

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 43
     end
     do
        return 43
     end

@@ -678,7 +678,7 @@ redef class TKwself
 end
 
 redef class TKwtrue
 end
 
 redef class TKwtrue

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 44
     end
     do
        return 44
     end

@@ -693,7 +693,7 @@ redef class TKwtrue
 end
 
 redef class TKwfalse
 end
 
 redef class TKwfalse

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 45
     end
     do
        return 45
     end

@@ -708,7 +708,7 @@ redef class TKwfalse
 end
 
 redef class TKwnull
 end
 
 redef class TKwnull

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 46
     end
     do
        return 46
     end

@@ -723,7 +723,7 @@ redef class TKwnull
 end
 
 redef class TKwas
 end
 
 redef class TKwas

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 47
     end
     do
        return 47
     end

@@ -738,7 +738,7 @@ redef class TKwas
 end
 
 redef class TKwwith
 end
 
 redef class TKwwith

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 48
     end
     do
        return 48
     end

@@ -753,7 +753,7 @@ redef class TKwwith
 end
 
 redef class TKwnullable
 end
 
 redef class TKwnullable

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 49
     end
     do
        return 49
     end

@@ -768,7 +768,7 @@ redef class TKwnullable
 end
 
 redef class TKwisset
 end
 
 redef class TKwisset

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 50
     end
     do
        return 50
     end

@@ -783,7 +783,7 @@ redef class TKwisset
 end
 
 redef class TOpar
 end
 
 redef class TOpar

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 51
     end
     do
        return 51
     end

@@ -798,7 +798,7 @@ redef class TOpar
 end
 
 redef class TCpar
 end
 
 redef class TCpar

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 52
     end
     do
        return 52
     end

@@ -813,7 +813,7 @@ redef class TCpar
 end
 
 redef class TObra
 end
 
 redef class TObra

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 53
     end
     do
        return 53
     end

@@ -828,7 +828,7 @@ redef class TObra
 end
 
 redef class TCbra
 end
 
 redef class TCbra

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 54
     end
     do
        return 54
     end

@@ -843,7 +843,7 @@ redef class TCbra
 end
 
 redef class TComma
 end
 
 redef class TComma

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 55
     end
     do
        return 55
     end

@@ -858,7 +858,7 @@ redef class TComma
 end
 
 redef class TColumn
 end
 
 redef class TColumn

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 56
     end
     do
        return 56
     end

@@ -873,7 +873,7 @@ redef class TColumn
 end
 
 redef class TQuad
 end
 
 redef class TQuad

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 57
     end
     do
        return 57
     end

@@ -888,7 +888,7 @@ redef class TQuad
 end
 
 redef class TAssign
 end
 
 redef class TAssign

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 58
     end
     do
        return 58
     end

@@ -903,7 +903,7 @@ redef class TAssign
 end
 
 redef class TPluseq
 end
 
 redef class TPluseq

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 59
     end
     do
        return 59
     end

@@ -918,7 +918,7 @@ redef class TPluseq
 end
 
 redef class TMinuseq
 end
 
 redef class TMinuseq

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 60
     end
     do
        return 60
     end

@@ -933,7 +933,7 @@ redef class TMinuseq
 end
 
 redef class TDotdotdot
 end
 
 redef class TDotdotdot

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 61
     end
     do
        return 61
     end

@@ -948,7 +948,7 @@ redef class TDotdotdot
 end
 
 redef class TDotdot
 end
 
 redef class TDotdot

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 62
     end
     do
        return 62
     end

@@ -963,7 +963,7 @@ redef class TDotdot
 end
 
 redef class TDot
 end
 
 redef class TDot

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 63
     end
     do
        return 63
     end

@@ -978,7 +978,7 @@ redef class TDot
 end
 
 redef class TPlus
 end
 
 redef class TPlus

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 64
     end
     do
        return 64
     end

@@ -993,7 +993,7 @@ redef class TPlus
 end
 
 redef class TMinus
 end
 
 redef class TMinus

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 65
     end
     do
        return 65
     end

@@ -1008,7 +1008,7 @@ redef class TMinus
 end
 
 redef class TStar
 end
 
 redef class TStar

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 66
     end
     do
        return 66
     end

@@ -1023,7 +1023,7 @@ redef class TStar
 end
 
 redef class TSlash
 end
 
 redef class TSlash

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 67
     end
     do
        return 67
     end

@@ -1038,7 +1038,7 @@ redef class TSlash
 end
 
 redef class TPercent
 end
 
 redef class TPercent

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 68
     end
     do
        return 68
     end

@@ -1053,7 +1053,7 @@ redef class TPercent
 end
 
 redef class TEq
 end
 
 redef class TEq

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 69
     end
     do
        return 69
     end

@@ -1068,7 +1068,7 @@ redef class TEq
 end
 
 redef class TNe
 end
 
 redef class TNe

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 70
     end
     do
        return 70
     end

@@ -1083,7 +1083,7 @@ redef class TNe
 end
 
 redef class TLt
 end
 
 redef class TLt

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 71
     end
     do
        return 71
     end

@@ -1098,7 +1098,7 @@ redef class TLt
 end
 
 redef class TLe
 end
 
 redef class TLe

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 72
     end
     do
        return 72
     end

@@ -1113,7 +1113,7 @@ redef class TLe
 end
 
 redef class TGt
 end
 
 redef class TGt

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 73
     end
     do
        return 73
     end

@@ -1128,7 +1128,7 @@ redef class TGt
 end
 
 redef class TGe
 end
 
 redef class TGe

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 74
     end
     do
        return 74
     end

@@ -1143,7 +1143,7 @@ redef class TGe
 end
 
 redef class TStarship
 end
 
 redef class TStarship

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 75
     end
     do
        return 75
     end

@@ -1158,7 +1158,7 @@ redef class TStarship
 end
 
 redef class TClassid
 end
 
 redef class TClassid

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 76
     end
     do
        return 76
     end

@@ -1173,7 +1173,7 @@ redef class TClassid
 end
 
 redef class TId
 end
 
 redef class TId

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 77
     end
     do
        return 77
     end

@@ -1188,7 +1188,7 @@ redef class TId
 end
 
 redef class TAttrid
 end
 
 redef class TAttrid

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 78
     end
     do
        return 78
     end

@@ -1203,7 +1203,7 @@ redef class TAttrid
 end
 
 redef class TNumber
 end
 
 redef class TNumber

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 79
     end
     do
        return 79
     end

@@ -1218,7 +1218,7 @@ redef class TNumber
 end
 
 redef class TFloat
 end
 
 redef class TFloat

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 80
     end
     do
        return 80
     end

@@ -1233,7 +1233,7 @@ redef class TFloat
 end
 
 redef class TChar
 end
 
 redef class TChar

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 81
     end
     do
        return 81
     end

@@ -1248,7 +1248,7 @@ redef class TChar
 end
 
 redef class TString
 end
 
 redef class TString

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 82
     end
     do
        return 82
     end

@@ -1263,7 +1263,7 @@ redef class TString
 end
 
 redef class TStartString
 end
 
 redef class TStartString

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 83
     end
     do
        return 83
     end

@@ -1278,7 +1278,7 @@ redef class TStartString
 end
 
 redef class TMidString
 end
 
 redef class TMidString

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 84
     end
     do
        return 84
     end

@@ -1293,7 +1293,7 @@ redef class TMidString
 end
 
 redef class TEndString
 end
 
 redef class TEndString

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 85
     end
     do
        return 85
     end

@@ -1309,7 +1309,7 @@ end
 
 
 redef class EOF 
 
 
 redef class EOF 

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return 86
     end
     do
        return 86
     end

@@ -1324,7 +1324,7 @@ redef class EOF
 end
 
 redef class PError
 end
 
 redef class PError

-    readable writable attr _message: String 
+    readable writable var _message: String 

     
     init init_error(fname: String, line: Int, pos: Int, message: String)
     do
     
     init init_error(fname: String, line: Int, pos: Int, message: String)
     do

@@ -1338,40 +1338,40 @@ end
 # It is better user with the Parser
 class Lexer
        # Last peeked token
 # It is better user with the Parser
 class Lexer
        # Last peeked token

-       attr _token: nullable Token
+       var _token: nullable Token

 
        # Lexer current state
 
        # Lexer current state

-       attr _state: Int = 0
+       var _state: Int = 0

 
        # Name of the stream (as given to tokens)
 
        # Name of the stream (as given to tokens)

-       readable attr _filename: String 
+       readable var _filename: String 

 
        # Input stream where character are read
 
        # Input stream where character are read

-       attr _stream: IStream
+       var _stream: IStream

 
        # Pushback buffer to store unread character
 
        # Pushback buffer to store unread character

-       attr _stream_buf: Buffer
+       var _stream_buf: Buffer

 
        # Number of character stored in the pushback buffer
 
        # Number of character stored in the pushback buffer

-       attr _stream_pos: Int
+       var _stream_pos: Int

 
        # Current line number in the input stream
 
        # Current line number in the input stream

-       attr _line: Int = 0
+       var _line: Int = 0

 
        # Current column in the input stream
 
        # Current column in the input stream

-       attr _pos: Int = 0
+       var _pos: Int = 0

 
        # Was the last character a cariage-return?
 
        # Was the last character a cariage-return?

-       attr _cr: Bool = false
+       var _cr: Bool = false

 
        # If the end of stream?
 
        # If the end of stream?

-       attr _eof: Bool = false
+       var _eof: Bool = false

 
        # Current working text read from the input stream
 
        # Current working text read from the input stream

-       attr _text: Buffer
+       var _text: Buffer

 
        # Constante state values
 
        # Constante state values

-       private meth state_initial: Int do return 0 end
+       private fun state_initial: Int do return 0 end

 
        # Create a new lexer for a stream (and a name)
        init(stream: IStream, fname: String)
 
        # Create a new lexer for a stream (and a name)
        init(stream: IStream, fname: String)

@@ -1386,7 +1386,7 @@ class Lexer
        end
 
        # Give the next token (but do not consume it)
        end
 
        # Give the next token (but do not consume it)

-       meth peek: Token
+       fun peek: Token

        do
                while _token == null do
                        _token = get_token
        do
                while _token == null do
                        _token = get_token

@@ -1395,7 +1395,7 @@ class Lexer
        end
 
        # Give and consume the next token
        end
 
        # Give and consume the next token

-       meth next: Token
+       fun next: Token

        do
                var result = _token
                while result == null do
        do
                var result = _token
                while result == null do

@@ -1406,7 +1406,7 @@ class Lexer
        end
 
        # Get a token, or null if it is discarded
        end
 
        # Get a token, or null if it is discarded

-       private meth get_token: nullable Token
+       private fun get_token: nullable Token

        do
                var dfa_state = 0
 
        do
                var dfa_state = 0
 

@@ -2124,7 +2124,7 @@ class Lexer
 
        # Read the next character.
        # The character is read from the stream of from the pushback buffer.
 
        # Read the next character.
        # The character is read from the stream of from the pushback buffer.

-       private meth get_char: Int
+       private fun get_char: Int

        do
                if _eof then
                        return -1
        do
                if _eof then
                        return -1

@@ -2150,7 +2150,7 @@ class Lexer
 
        # Unread some characters.
        # Unread characters are stored in the pushback buffer.
 
        # Unread some characters.
        # Unread characters are stored in the pushback buffer.

-       private meth push_back(accept_length: Int)
+       private fun push_back(accept_length: Int)

        do
                var length = _text.length
                var i = length - 1
        do
                var length = _text.length
                var i = length - 1

@@ -2162,8 +2162,8 @@ class Lexer
                end
        end
 
                end
        end
 

-       attr _goto_table: Array[Array[Array[Array[Int]]]]
-       private meth build_goto_table
+       var _goto_table: Array[Array[Array[Array[Int]]]]
+       private fun build_goto_table

        do
                _goto_table = once [
                        [
        do
                _goto_table = once [
                        [

@@ -3373,13 +3373,13 @@ class Lexer
                ]
        end
     
                ]
        end
     

-       private meth nil_array: Array[Array[Int]]
+       private fun nil_array: Array[Array[Int]]

        do
                return once new Array[Array[Int]]
        end
 
        do
                return once new Array[Array[Int]]
        end
 

-       attr _accept_table: Array[Array[Int]]
-       private meth build_accept_table do
+       var _accept_table: Array[Array[Int]]
+       private fun build_accept_table do

                _accept_table = once [
                        [
                                -1 , 0 , 1 , 1 , 0 , -1 , -1 , -1 , 69 , -1 , 52 , 53 , 67 , 65 , 56 , 66 , 64 , 68 , 80 , 57 , 72 , 59 , 74 , 77 , 54 , 55 , -1 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , -1 , 1 , 71 , -1 , 83 , -1 , 84 , -1 , 2 , 2 , -1 , 82 , 60 , 61 , 63 , 81 , -1 , 58 , 73 , 70 , 75 , 77 , 77 , 77 , 77 , 79 , 78 , 78 , 78 , 78 , 78 , 78 , 48 , 78 , 78 , 78 , 78 , 17 , 78 , 78 , 78 , 78 , 78 , 78 , 26 , 78 , 31 , 16 , 78 , 78 , 78 , 78 , 78 , 33 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , -1 , 86 , -1 , 85 , -1 , 2 , 62 , 76 , 79 , 79 , 79 , 79 , 78 , 78 , 32 , 78 , 78 , 78 , 78 , 78 , 78 , 10 , 78 , 78 , 30 , 11 , 78 , 78 , 78 , 41 , 78 , 78 , 40 , 34 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 20 , 78 , 78 , 78 , -1 , 78 , 78 , 78 , 13 , 78 , 78 , 78 , 28 , 78 , 78 , 78 , 14 , 78 , 78 , 78 , 11 , 47 , 42 , 78 , 78 , 78 , 78 , 78 , 78 , 44 , 78 , 78 , 27 , 45 , 12 , 78 , 78 , 49 , 78 , 38 , 78 , 78 , 37 , 5 , 78 , 78 , 46 , 78 , 78 , 78 , 51 , 78 , 78 , 78 , 78 , 78 , 15 , 78 , 78 , 43 , 78 , 29 , 78 , 78 , 39 , 78 , 22 , 4 , 78 , 21 , 78 , 78 , 78 , 78 , 78 , 78 , 35 , 78 , 78 , 78 , 78 , 78 , 78 , 25 , 78 , 3 , 24 , 78 , 78 , 9 , 78 , 78 , 6 , 36 , 78 , 50 , 78 , 18 , 78 , 19 , 7 , 23 , 8  
                _accept_table = once [
                        [
                                -1 , 0 , 1 , 1 , 0 , -1 , -1 , -1 , 69 , -1 , 52 , 53 , 67 , 65 , 56 , 66 , 64 , 68 , 80 , 57 , 72 , 59 , 74 , 77 , 54 , 55 , -1 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , -1 , 1 , 71 , -1 , 83 , -1 , 84 , -1 , 2 , 2 , -1 , 82 , 60 , 61 , 63 , 81 , -1 , 58 , 73 , 70 , 75 , 77 , 77 , 77 , 77 , 79 , 78 , 78 , 78 , 78 , 78 , 78 , 48 , 78 , 78 , 78 , 78 , 17 , 78 , 78 , 78 , 78 , 78 , 78 , 26 , 78 , 31 , 16 , 78 , 78 , 78 , 78 , 78 , 33 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , -1 , 86 , -1 , 85 , -1 , 2 , 62 , 76 , 79 , 79 , 79 , 79 , 78 , 78 , 32 , 78 , 78 , 78 , 78 , 78 , 78 , 10 , 78 , 78 , 30 , 11 , 78 , 78 , 78 , 41 , 78 , 78 , 40 , 34 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 20 , 78 , 78 , 78 , -1 , 78 , 78 , 78 , 13 , 78 , 78 , 78 , 28 , 78 , 78 , 78 , 14 , 78 , 78 , 78 , 11 , 47 , 42 , 78 , 78 , 78 , 78 , 78 , 78 , 44 , 78 , 78 , 27 , 45 , 12 , 78 , 78 , 49 , 78 , 38 , 78 , 78 , 37 , 5 , 78 , 78 , 46 , 78 , 78 , 78 , 51 , 78 , 78 , 78 , 78 , 78 , 15 , 78 , 78 , 43 , 78 , 29 , 78 , 78 , 39 , 78 , 22 , 4 , 78 , 21 , 78 , 78 , 78 , 78 , 78 , 78 , 35 , 78 , 78 , 78 , 78 , 78 , 78 , 25 , 78 , 3 , 24 , 78 , 78 , 9 , 78 , 78 , 6 , 36 , 78 , 50 , 78 , 18 , 78 , 19 , 7 , 23 , 8  

diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index 965e0fb..3f668cf 100644 (file)
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -8,10 +8,10 @@ intrude import parser_tables
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number

-       readable writable attr _state: Int
+       readable writable var _state: Int

 
        # The node stored with the state in the stack
 
        # The node stored with the state in the stack

-       readable writable attr _nodes: nullable Object 
+       readable writable var _nodes: nullable Object 

 
        init(state: Int, nodes: nullable Object)
        do
 
        init(state: Int, nodes: nullable Object)
        do

@@ -23,13 +23,13 @@ end
 class Parser
 special ParserTable
        # Associated lexer
 class Parser
 special ParserTable
        # Associated lexer

-       attr _lexer: Lexer
+       var _lexer: Lexer

 
        # Stack of pushed states and productions
 
        # Stack of pushed states and productions

-       attr _stack: Array[State]
+       var _stack: Array[State]

 
        # Position in the stack
 
        # Position in the stack

-       attr _stack_pos: Int
+       var _stack_pos: Int

 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)
 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)

@@ -43,7 +43,7 @@ special ParserTable
        end
 
        # Do a transition in the automata
        end
 
        # Do a transition in the automata

-       private meth go_to(index: Int): Int
+       private fun go_to(index: Int): Int

        do
                var state = state
                var table = _goto_table[index]
        do
                var state = state
                var table = _goto_table[index]

@@ -67,7 +67,7 @@ special ParserTable
        end
 
        # Push someting in the state stack
        end
 
        # Push someting in the state stack

-       private meth push(numstate: Int, list_node: nullable Object)
+       private fun push(numstate: Int, list_node: nullable Object)

        do
                var pos = _stack_pos + 1
                _stack_pos = pos
        do
                var pos = _stack_pos + 1
                _stack_pos = pos

@@ -81,13 +81,13 @@ special ParserTable
        end
 
        # The current state
        end
 
        # The current state

-       private meth state: Int
+       private fun state: Int

        do
                return _stack[_stack_pos].state
        end
 
        # Pop something from the stack state
        do
                return _stack[_stack_pos].state
        end
 
        # Pop something from the stack state

-       private meth pop: nullable Object
+       private fun pop: nullable Object

        do
                var res = _stack[_stack_pos].nodes
                _stack_pos = _stack_pos -1
        do
                var res = _stack[_stack_pos].nodes
                _stack_pos = _stack_pos -1

@@ -95,7 +95,7 @@ special ParserTable
        end
 
        # Build and return a full AST.
        end
 
        # Build and return a full AST.

-       meth parse: Start
+       fun parse: Start

        do
                push(0, null)
 
        do
                push(0, null)
 

@@ -153,8 +153,8 @@ special ParserTable
                abort
        end
 
                abort
        end
 

-       attr _reduce_table: Array[ReduceAction]
-       private meth build_reduce_table
+       var _reduce_table: Array[ReduceAction]
+       private fun build_reduce_table

        do
                _reduce_table = new Array[ReduceAction].with_items(
                        new ReduceAction0,
        do
                _reduce_table = new Array[ReduceAction].with_items(
                        new ReduceAction0,

@@ -902,9 +902,9 @@ end
 # Find first and last tokens of production nodes
 private class SearchTokensVisitor
 special Visitor
 # Find first and last tokens of production nodes
 private class SearchTokensVisitor
 special Visitor

-       attr _untokenned_nodes: Array[Prod]
-       attr _last_token: nullable Token = null
-       redef meth visit(n: nullable PNode)
+       var _untokenned_nodes: Array[Prod]
+       var _last_token: nullable Token = null
+       redef fun visit(n: nullable PNode)

        do
                if n == null then
                        return
        do
                if n == null then
                        return

@@ -929,12 +929,12 @@ end
 
 # Each reduca action has its own class, this one is the root of the hierarchy.
 private abstract class ReduceAction
 
 # Each reduca action has its own class, this one is the root of the hierarchy.
 private abstract class ReduceAction

-       meth action(p: Parser) is abstract
+       fun action(p: Parser) is abstract

 end
 
 private class ReduceAction0
 special ReduceAction
 end
 
 private class ReduceAction0
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var listnode3 = new Array[Object]
        do
                                        var node_list: nullable Object = null
                                        var listnode3 = new Array[Object]

@@ -951,7 +951,7 @@ init do end
 end
 private class ReduceAction1
 special ReduceAction
 end
 private class ReduceAction1
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -971,7 +971,7 @@ init do end
 end
 private class ReduceAction2
 special ReduceAction
 end
 private class ReduceAction2
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -998,7 +998,7 @@ init do end
 end
 private class ReduceAction3
 special ReduceAction
 end
 private class ReduceAction3
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -1028,7 +1028,7 @@ init do end
 end
 private class ReduceAction4
 special ReduceAction
 end
 private class ReduceAction4
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -1055,7 +1055,7 @@ init do end
 end
 private class ReduceAction5
 special ReduceAction
 end
 private class ReduceAction5
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -1085,7 +1085,7 @@ init do end
 end
 private class ReduceAction6
 special ReduceAction
 end
 private class ReduceAction6
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -1122,7 +1122,7 @@ init do end
 end
 private class ReduceAction7
 special ReduceAction
 end
 private class ReduceAction7
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -1162,7 +1162,7 @@ init do end
 end
 private class ReduceAction8
 special ReduceAction
 end
 private class ReduceAction8
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -1193,7 +1193,7 @@ init do end
 end
 private class ReduceAction9
 special ReduceAction
 end
 private class ReduceAction9
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -1234,7 +1234,7 @@ init do end
 end
 private class ReduceAction10
 special ReduceAction
 end
 private class ReduceAction10
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -1268,7 +1268,7 @@ init do end
 end
 private class ReduceAction11
 special ReduceAction
 end
 private class ReduceAction11
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1312,7 +1312,7 @@ init do end
 end
 private class ReduceAction12
 special ReduceAction
 end
 private class ReduceAction12
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -1353,7 +1353,7 @@ init do end
 end
 private class ReduceAction13
 special ReduceAction
 end
 private class ReduceAction13
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1404,7 +1404,7 @@ init do end
 end
 private class ReduceAction14
 special ReduceAction
 end
 private class ReduceAction14
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1448,7 +1448,7 @@ init do end
 end
 private class ReduceAction15
 special ReduceAction
 end
 private class ReduceAction15
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -1502,7 +1502,7 @@ init do end
 end
 private class ReduceAction16
 special ReduceAction
 end
 private class ReduceAction16
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -1543,7 +1543,7 @@ init do end
 end
 private class ReduceAction17
 special ReduceAction
 end
 private class ReduceAction17
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1594,7 +1594,7 @@ init do end
 end
 private class ReduceAction18
 special ReduceAction
 end
 private class ReduceAction18
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1638,7 +1638,7 @@ init do end
 end
 private class ReduceAction19
 special ReduceAction
 end
 private class ReduceAction19
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -1692,7 +1692,7 @@ init do end
 end
 private class ReduceAction20
 special ReduceAction
 end
 private class ReduceAction20
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -1743,7 +1743,7 @@ init do end
 end
 private class ReduceAction21
 special ReduceAction
 end
 private class ReduceAction21
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -1804,7 +1804,7 @@ init do end
 end
 private class ReduceAction22
 special ReduceAction
 end
 private class ReduceAction22
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -1858,7 +1858,7 @@ init do end
 end
 private class ReduceAction23
 special ReduceAction
 end
 private class ReduceAction23
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -1922,7 +1922,7 @@ init do end
 end
 private class ReduceAction24
 special ReduceAction
 end
 private class ReduceAction24
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -1945,7 +1945,7 @@ init do end
 end
 private class ReduceAction25
 special ReduceAction
 end
 private class ReduceAction25
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -1971,7 +1971,7 @@ init do end
 end
 private class ReduceAction26
 special ReduceAction
 end
 private class ReduceAction26
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -2004,7 +2004,7 @@ init do end
 end
 private class ReduceAction27
 special ReduceAction
 end
 private class ReduceAction27
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -2040,7 +2040,7 @@ init do end
 end
 private class ReduceAction28
 special ReduceAction
 end
 private class ReduceAction28
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -2073,7 +2073,7 @@ init do end
 end
 private class ReduceAction29
 special ReduceAction
 end
 private class ReduceAction29
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -2109,7 +2109,7 @@ init do end
 end
 private class ReduceAction30
 special ReduceAction
 end
 private class ReduceAction30
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -2152,7 +2152,7 @@ init do end
 end
 private class ReduceAction31
 special ReduceAction
 end
 private class ReduceAction31
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -2198,7 +2198,7 @@ init do end
 end
 private class ReduceAction32
 special ReduceAction
 end
 private class ReduceAction32
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -2235,7 +2235,7 @@ init do end
 end
 private class ReduceAction33
 special ReduceAction
 end
 private class ReduceAction33
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -2282,7 +2282,7 @@ init do end
 end
 private class ReduceAction34
 special ReduceAction
 end
 private class ReduceAction34
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -2322,7 +2322,7 @@ init do end
 end
 private class ReduceAction35
 special ReduceAction
 end
 private class ReduceAction35
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2372,7 +2372,7 @@ init do end
 end
 private class ReduceAction36
 special ReduceAction
 end
 private class ReduceAction36
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -2419,7 +2419,7 @@ init do end
 end
 private class ReduceAction37
 special ReduceAction
 end
 private class ReduceAction37
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2476,7 +2476,7 @@ init do end
 end
 private class ReduceAction38
 special ReduceAction
 end
 private class ReduceAction38
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2526,7 +2526,7 @@ init do end
 end
 private class ReduceAction39
 special ReduceAction
 end
 private class ReduceAction39
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -2586,7 +2586,7 @@ init do end
 end
 private class ReduceAction40
 special ReduceAction
 end
 private class ReduceAction40
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -2633,7 +2633,7 @@ init do end
 end
 private class ReduceAction41
 special ReduceAction
 end
 private class ReduceAction41
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2690,7 +2690,7 @@ init do end
 end
 private class ReduceAction42
 special ReduceAction
 end
 private class ReduceAction42
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2740,7 +2740,7 @@ init do end
 end
 private class ReduceAction43
 special ReduceAction
 end
 private class ReduceAction43
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -2800,7 +2800,7 @@ init do end
 end
 private class ReduceAction44
 special ReduceAction
 end
 private class ReduceAction44
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -2857,7 +2857,7 @@ init do end
 end
 private class ReduceAction45
 special ReduceAction
 end
 private class ReduceAction45
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -2924,7 +2924,7 @@ init do end
 end
 private class ReduceAction46
 special ReduceAction
 end
 private class ReduceAction46
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -2984,7 +2984,7 @@ init do end
 end
 private class ReduceAction47
 special ReduceAction
 end
 private class ReduceAction47
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -3054,7 +3054,7 @@ init do end
 end
 private class ReduceAction48
 special ReduceAction
 end
 private class ReduceAction48
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -3080,7 +3080,7 @@ init do end
 end
 private class ReduceAction49
 special ReduceAction
 end
 private class ReduceAction49
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -3107,7 +3107,7 @@ init do end
 end
 private class ReduceAction50
 special ReduceAction
 end
 private class ReduceAction50
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -3134,7 +3134,7 @@ init do end
 end
 private class ReduceAction51
 special ReduceAction
 end
 private class ReduceAction51
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -3154,7 +3154,7 @@ init do end
 end
 private class ReduceAction52
 special ReduceAction
 end
 private class ReduceAction52
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -3165,7 +3165,7 @@ init do end
 end
 private class ReduceAction53
 special ReduceAction
 end
 private class ReduceAction53
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -3191,7 +3191,7 @@ init do end
 end
 private class ReduceAction54
 special ReduceAction
 end
 private class ReduceAction54
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -3227,7 +3227,7 @@ init do end
 end
 private class ReduceAction55
 special ReduceAction
 end
 private class ReduceAction55
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -3265,7 +3265,7 @@ init do end
 end
 private class ReduceAction56
 special ReduceAction
 end
 private class ReduceAction56
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -3306,7 +3306,7 @@ init do end
 end
 private class ReduceAction57
 special ReduceAction
 end
 private class ReduceAction57
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -3354,7 +3354,7 @@ init do end
 end
 private class ReduceAction58
 special ReduceAction
 end
 private class ReduceAction58
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -3405,7 +3405,7 @@ init do end
 end
 private class ReduceAction59
 special ReduceAction
 end
 private class ReduceAction59
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -3453,7 +3453,7 @@ init do end
 end
 private class ReduceAction60
 special ReduceAction
 end
 private class ReduceAction60
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -3504,7 +3504,7 @@ init do end
 end
 private class ReduceAction61
 special ReduceAction
 end
 private class ReduceAction61
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -3562,7 +3562,7 @@ init do end
 end
 private class ReduceAction62
 special ReduceAction
 end
 private class ReduceAction62
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -3623,7 +3623,7 @@ init do end
 end
 private class ReduceAction63
 special ReduceAction
 end
 private class ReduceAction63
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -3668,7 +3668,7 @@ init do end
 end
 private class ReduceAction64
 special ReduceAction
 end
 private class ReduceAction64
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -3723,7 +3723,7 @@ init do end
 end
 private class ReduceAction65
 special ReduceAction
 end
 private class ReduceAction65
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -3771,7 +3771,7 @@ init do end
 end
 private class ReduceAction66
 special ReduceAction
 end
 private class ReduceAction66
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -3829,7 +3829,7 @@ init do end
 end
 private class ReduceAction67
 special ReduceAction
 end
 private class ReduceAction67
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -3884,7 +3884,7 @@ init do end
 end
 private class ReduceAction68
 special ReduceAction
 end
 private class ReduceAction68
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -3949,7 +3949,7 @@ init do end
 end
 private class ReduceAction69
 special ReduceAction
 end
 private class ReduceAction69
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -4007,7 +4007,7 @@ init do end
 end
 private class ReduceAction70
 special ReduceAction
 end
 private class ReduceAction70
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -4075,7 +4075,7 @@ init do end
 end
 private class ReduceAction71
 special ReduceAction
 end
 private class ReduceAction71
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -4130,7 +4130,7 @@ init do end
 end
 private class ReduceAction72
 special ReduceAction
 end
 private class ReduceAction72
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -4195,7 +4195,7 @@ init do end
 end
 private class ReduceAction73
 special ReduceAction
 end
 private class ReduceAction73
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -4253,7 +4253,7 @@ init do end
 end
 private class ReduceAction74
 special ReduceAction
 end
 private class ReduceAction74
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -4321,7 +4321,7 @@ init do end
 end
 private class ReduceAction75
 special ReduceAction
 end
 private class ReduceAction75
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -4386,7 +4386,7 @@ init do end
 end
 private class ReduceAction76
 special ReduceAction
 end
 private class ReduceAction76
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -4461,7 +4461,7 @@ init do end
 end
 private class ReduceAction77
 special ReduceAction
 end
 private class ReduceAction77
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -4529,7 +4529,7 @@ init do end
 end
 private class ReduceAction78
 special ReduceAction
 end
 private class ReduceAction78
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop

@@ -4607,7 +4607,7 @@ init do end
 end
 private class ReduceAction79
 special ReduceAction
 end
 private class ReduceAction79
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -4623,7 +4623,7 @@ init do end
 end
 private class ReduceAction80
 special ReduceAction
 end
 private class ReduceAction80
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -4643,7 +4643,7 @@ init do end
 end
 private class ReduceAction81
 special ReduceAction
 end
 private class ReduceAction81
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -4659,7 +4659,7 @@ init do end
 end
 private class ReduceAction82
 special ReduceAction
 end
 private class ReduceAction82
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -4675,7 +4675,7 @@ init do end
 end
 private class ReduceAction83
 special ReduceAction
 end
 private class ReduceAction83
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -4696,7 +4696,7 @@ init do end
 end
 private class ReduceAction84
 special ReduceAction
 end
 private class ReduceAction84
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -4727,7 +4727,7 @@ init do end
 end
 private class ReduceAction85
 special ReduceAction
 end
 private class ReduceAction85
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -4742,7 +4742,7 @@ init do end
 end
 private class ReduceAction86
 special ReduceAction
 end
 private class ReduceAction86
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -4759,7 +4759,7 @@ init do end
 end
 private class ReduceAction87
 special ReduceAction
 end
 private class ReduceAction87
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -4779,7 +4779,7 @@ init do end
 end
 private class ReduceAction88
 special ReduceAction
 end
 private class ReduceAction88
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -4801,7 +4801,7 @@ init do end
 end
 private class ReduceAction89
 special ReduceAction
 end
 private class ReduceAction89
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -4815,7 +4815,7 @@ init do end
 end
 private class ReduceAction90
 special ReduceAction
 end
 private class ReduceAction90
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -4853,7 +4853,7 @@ init do end
 end
 private class ReduceAction91
 special ReduceAction
 end
 private class ReduceAction91
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -4894,7 +4894,7 @@ init do end
 end
 private class ReduceAction92
 special ReduceAction
 end
 private class ReduceAction92
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -4933,7 +4933,7 @@ init do end
 end
 private class ReduceAction93
 special ReduceAction
 end
 private class ReduceAction93
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -4975,7 +4975,7 @@ init do end
 end
 private class ReduceAction94
 special ReduceAction
 end
 private class ReduceAction94
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5010,7 +5010,7 @@ init do end
 end
 private class ReduceAction95
 special ReduceAction
 end
 private class ReduceAction95
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5048,7 +5048,7 @@ init do end
 end
 private class ReduceAction96
 special ReduceAction
 end
 private class ReduceAction96
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5083,7 +5083,7 @@ init do end
 end
 private class ReduceAction97
 special ReduceAction
 end
 private class ReduceAction97
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5121,7 +5121,7 @@ init do end
 end
 private class ReduceAction98
 special ReduceAction
 end
 private class ReduceAction98
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5157,7 +5157,7 @@ init do end
 end
 private class ReduceAction99
 special ReduceAction
 end
 private class ReduceAction99
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5196,7 +5196,7 @@ init do end
 end
 private class ReduceAction100
 special ReduceAction
 end
 private class ReduceAction100
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5235,7 +5235,7 @@ init do end
 end
 private class ReduceAction101
 special ReduceAction
 end
 private class ReduceAction101
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -5277,7 +5277,7 @@ init do end
 end
 private class ReduceAction102
 special ReduceAction
 end
 private class ReduceAction102
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -5325,7 +5325,7 @@ init do end
 end
 private class ReduceAction103
 special ReduceAction
 end
 private class ReduceAction103
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5376,7 +5376,7 @@ init do end
 end
 private class ReduceAction104
 special ReduceAction
 end
 private class ReduceAction104
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -5417,7 +5417,7 @@ init do end
 end
 private class ReduceAction105
 special ReduceAction
 end
 private class ReduceAction105
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5468,7 +5468,7 @@ init do end
 end
 private class ReduceAction106
 special ReduceAction
 end
 private class ReduceAction106
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5522,7 +5522,7 @@ init do end
 end
 private class ReduceAction107
 special ReduceAction
 end
 private class ReduceAction107
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -5566,7 +5566,7 @@ init do end
 end
 private class ReduceAction108
 special ReduceAction
 end
 private class ReduceAction108
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -5607,7 +5607,7 @@ init do end
 end
 private class ReduceAction109
 special ReduceAction
 end
 private class ReduceAction109
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -5651,7 +5651,7 @@ init do end
 end
 private class ReduceAction110
 special ReduceAction
 end
 private class ReduceAction110
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -5685,7 +5685,7 @@ init do end
 end
 private class ReduceAction111
 special ReduceAction
 end
 private class ReduceAction111
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5736,7 +5736,7 @@ init do end
 end
 private class ReduceAction112
 special ReduceAction
 end
 private class ReduceAction112
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5790,7 +5790,7 @@ init do end
 end
 private class ReduceAction113
 special ReduceAction
 end
 private class ReduceAction113
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -5834,7 +5834,7 @@ init do end
 end
 private class ReduceAction114
 special ReduceAction
 end
 private class ReduceAction114
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -5888,7 +5888,7 @@ init do end
 end
 private class ReduceAction115
 special ReduceAction
 end
 private class ReduceAction115
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -5945,7 +5945,7 @@ init do end
 end
 private class ReduceAction116
 special ReduceAction
 end
 private class ReduceAction116
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -5992,7 +5992,7 @@ init do end
 end
 private class ReduceAction117
 special ReduceAction
 end
 private class ReduceAction117
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -6036,7 +6036,7 @@ init do end
 end
 private class ReduceAction118
 special ReduceAction
 end
 private class ReduceAction118
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6083,7 +6083,7 @@ init do end
 end
 private class ReduceAction119
 special ReduceAction
 end
 private class ReduceAction119
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -6120,7 +6120,7 @@ init do end
 end
 private class ReduceAction120
 special ReduceAction
 end
 private class ReduceAction120
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6171,7 +6171,7 @@ init do end
 end
 private class ReduceAction121
 special ReduceAction
 end
 private class ReduceAction121
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -6225,7 +6225,7 @@ init do end
 end
 private class ReduceAction122
 special ReduceAction
 end
 private class ReduceAction122
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -6269,7 +6269,7 @@ init do end
 end
 private class ReduceAction123
 special ReduceAction
 end
 private class ReduceAction123
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -6323,7 +6323,7 @@ init do end
 end
 private class ReduceAction124
 special ReduceAction
 end
 private class ReduceAction124
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -6380,7 +6380,7 @@ init do end
 end
 private class ReduceAction125
 special ReduceAction
 end
 private class ReduceAction125
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6427,7 +6427,7 @@ init do end
 end
 private class ReduceAction126
 special ReduceAction
 end
 private class ReduceAction126
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -6471,7 +6471,7 @@ init do end
 end
 private class ReduceAction127
 special ReduceAction
 end
 private class ReduceAction127
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6518,7 +6518,7 @@ init do end
 end
 private class ReduceAction128
 special ReduceAction
 end
 private class ReduceAction128
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -6555,7 +6555,7 @@ init do end
 end
 private class ReduceAction129
 special ReduceAction
 end
 private class ReduceAction129
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -6609,7 +6609,7 @@ init do end
 end
 private class ReduceAction130
 special ReduceAction
 end
 private class ReduceAction130
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -6666,7 +6666,7 @@ init do end
 end
 private class ReduceAction131
 special ReduceAction
 end
 private class ReduceAction131
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6713,7 +6713,7 @@ init do end
 end
 private class ReduceAction132
 special ReduceAction
 end
 private class ReduceAction132
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -6770,7 +6770,7 @@ init do end
 end
 private class ReduceAction133
 special ReduceAction
 end
 private class ReduceAction133
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -6830,7 +6830,7 @@ init do end
 end
 private class ReduceAction134
 special ReduceAction
 end
 private class ReduceAction134
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -6880,7 +6880,7 @@ init do end
 end
 private class ReduceAction135
 special ReduceAction
 end
 private class ReduceAction135
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -6927,7 +6927,7 @@ init do end
 end
 private class ReduceAction136
 special ReduceAction
 end
 private class ReduceAction136
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -6977,7 +6977,7 @@ init do end
 end
 private class ReduceAction137
 special ReduceAction
 end
 private class ReduceAction137
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -7017,7 +7017,7 @@ init do end
 end
 private class ReduceAction138
 special ReduceAction
 end
 private class ReduceAction138
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -7070,7 +7070,7 @@ init do end
 end
 private class ReduceAction139
 special ReduceAction
 end
 private class ReduceAction139
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -7126,7 +7126,7 @@ init do end
 end
 private class ReduceAction140
 special ReduceAction
 end
 private class ReduceAction140
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -7172,7 +7172,7 @@ init do end
 end
 private class ReduceAction141
 special ReduceAction
 end
 private class ReduceAction141
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -7228,7 +7228,7 @@ init do end
 end
 private class ReduceAction142
 special ReduceAction
 end
 private class ReduceAction142
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -7287,7 +7287,7 @@ init do end
 end
 private class ReduceAction143
 special ReduceAction
 end
 private class ReduceAction143
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -7336,7 +7336,7 @@ init do end
 end
 private class ReduceAction144
 special ReduceAction
 end
 private class ReduceAction144
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -7382,7 +7382,7 @@ init do end
 end
 private class ReduceAction145
 special ReduceAction
 end
 private class ReduceAction145
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -7431,7 +7431,7 @@ init do end
 end
 private class ReduceAction146
 special ReduceAction
 end
 private class ReduceAction146
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -7470,7 +7470,7 @@ init do end
 end
 private class ReduceAction147
 special ReduceAction
 end
 private class ReduceAction147
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -7526,7 +7526,7 @@ init do end
 end
 private class ReduceAction148
 special ReduceAction
 end
 private class ReduceAction148
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -7585,7 +7585,7 @@ init do end
 end
 private class ReduceAction149
 special ReduceAction
 end
 private class ReduceAction149
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -7634,7 +7634,7 @@ init do end
 end
 private class ReduceAction150
 special ReduceAction
 end
 private class ReduceAction150
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -7693,7 +7693,7 @@ init do end
 end
 private class ReduceAction151
 special ReduceAction
 end
 private class ReduceAction151
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -7755,7 +7755,7 @@ init do end
 end
 private class ReduceAction152
 special ReduceAction
 end
 private class ReduceAction152
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -7807,7 +7807,7 @@ init do end
 end
 private class ReduceAction153
 special ReduceAction
 end
 private class ReduceAction153
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -7856,7 +7856,7 @@ init do end
 end
 private class ReduceAction154
 special ReduceAction
 end
 private class ReduceAction154
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -7908,7 +7908,7 @@ init do end
 end
 private class ReduceAction155
 special ReduceAction
 end
 private class ReduceAction155
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -7950,7 +7950,7 @@ init do end
 end
 private class ReduceAction156
 special ReduceAction
 end
 private class ReduceAction156
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -8006,7 +8006,7 @@ init do end
 end
 private class ReduceAction157
 special ReduceAction
 end
 private class ReduceAction157
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -8065,7 +8065,7 @@ init do end
 end
 private class ReduceAction158
 special ReduceAction
 end
 private class ReduceAction158
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -8114,7 +8114,7 @@ init do end
 end
 private class ReduceAction159
 special ReduceAction
 end
 private class ReduceAction159
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -8173,7 +8173,7 @@ init do end
 end
 private class ReduceAction160
 special ReduceAction
 end
 private class ReduceAction160
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -8235,7 +8235,7 @@ init do end
 end
 private class ReduceAction161
 special ReduceAction
 end
 private class ReduceAction161
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -8287,7 +8287,7 @@ init do end
 end
 private class ReduceAction162
 special ReduceAction
 end
 private class ReduceAction162
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -8336,7 +8336,7 @@ init do end
 end
 private class ReduceAction163
 special ReduceAction
 end
 private class ReduceAction163
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -8388,7 +8388,7 @@ init do end
 end
 private class ReduceAction164
 special ReduceAction
 end
 private class ReduceAction164
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -8430,7 +8430,7 @@ init do end
 end
 private class ReduceAction165
 special ReduceAction
 end
 private class ReduceAction165
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -8489,7 +8489,7 @@ init do end
 end
 private class ReduceAction166
 special ReduceAction
 end
 private class ReduceAction166
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -8551,7 +8551,7 @@ init do end
 end
 private class ReduceAction167
 special ReduceAction
 end
 private class ReduceAction167
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -8603,7 +8603,7 @@ init do end
 end
 private class ReduceAction168
 special ReduceAction
 end
 private class ReduceAction168
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -8665,7 +8665,7 @@ init do end
 end
 private class ReduceAction169
 special ReduceAction
 end
 private class ReduceAction169
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop

@@ -8730,7 +8730,7 @@ init do end
 end
 private class ReduceAction170
 special ReduceAction
 end
 private class ReduceAction170
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -8785,7 +8785,7 @@ init do end
 end
 private class ReduceAction171
 special ReduceAction
 end
 private class ReduceAction171
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -8837,7 +8837,7 @@ init do end
 end
 private class ReduceAction172
 special ReduceAction
 end
 private class ReduceAction172
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -8892,7 +8892,7 @@ init do end
 end
 private class ReduceAction173
 special ReduceAction
 end
 private class ReduceAction173
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -8937,7 +8937,7 @@ init do end
 end
 private class ReduceAction174
 special ReduceAction
 end
 private class ReduceAction174
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -8985,7 +8985,7 @@ init do end
 end
 private class ReduceAction175
 special ReduceAction
 end
 private class ReduceAction175
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9036,7 +9036,7 @@ init do end
 end
 private class ReduceAction176
 special ReduceAction
 end
 private class ReduceAction176
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -9077,7 +9077,7 @@ init do end
 end
 private class ReduceAction177
 special ReduceAction
 end
 private class ReduceAction177
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9128,7 +9128,7 @@ init do end
 end
 private class ReduceAction178
 special ReduceAction
 end
 private class ReduceAction178
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -9182,7 +9182,7 @@ init do end
 end
 private class ReduceAction179
 special ReduceAction
 end
 private class ReduceAction179
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -9226,7 +9226,7 @@ init do end
 end
 private class ReduceAction180
 special ReduceAction
 end
 private class ReduceAction180
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -9267,7 +9267,7 @@ init do end
 end
 private class ReduceAction181
 special ReduceAction
 end
 private class ReduceAction181
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -9311,7 +9311,7 @@ init do end
 end
 private class ReduceAction182
 special ReduceAction
 end
 private class ReduceAction182
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -9345,7 +9345,7 @@ init do end
 end
 private class ReduceAction183
 special ReduceAction
 end
 private class ReduceAction183
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9396,7 +9396,7 @@ init do end
 end
 private class ReduceAction184
 special ReduceAction
 end
 private class ReduceAction184
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -9450,7 +9450,7 @@ init do end
 end
 private class ReduceAction185
 special ReduceAction
 end
 private class ReduceAction185
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -9494,7 +9494,7 @@ init do end
 end
 private class ReduceAction186
 special ReduceAction
 end
 private class ReduceAction186
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -9548,7 +9548,7 @@ init do end
 end
 private class ReduceAction187
 special ReduceAction
 end
 private class ReduceAction187
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -9605,7 +9605,7 @@ init do end
 end
 private class ReduceAction188
 special ReduceAction
 end
 private class ReduceAction188
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9652,7 +9652,7 @@ init do end
 end
 private class ReduceAction189
 special ReduceAction
 end
 private class ReduceAction189
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -9696,7 +9696,7 @@ init do end
 end
 private class ReduceAction190
 special ReduceAction
 end
 private class ReduceAction190
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9743,7 +9743,7 @@ init do end
 end
 private class ReduceAction191
 special ReduceAction
 end
 private class ReduceAction191
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -9780,7 +9780,7 @@ init do end
 end
 private class ReduceAction192
 special ReduceAction
 end
 private class ReduceAction192
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -9831,7 +9831,7 @@ init do end
 end
 private class ReduceAction193
 special ReduceAction
 end
 private class ReduceAction193
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -9885,7 +9885,7 @@ init do end
 end
 private class ReduceAction194
 special ReduceAction
 end
 private class ReduceAction194
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -9929,7 +9929,7 @@ init do end
 end
 private class ReduceAction195
 special ReduceAction
 end
 private class ReduceAction195
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -9983,7 +9983,7 @@ init do end
 end
 private class ReduceAction196
 special ReduceAction
 end
 private class ReduceAction196
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -10040,7 +10040,7 @@ init do end
 end
 private class ReduceAction197
 special ReduceAction
 end
 private class ReduceAction197
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -10087,7 +10087,7 @@ init do end
 end
 private class ReduceAction198
 special ReduceAction
 end
 private class ReduceAction198
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -10131,7 +10131,7 @@ init do end
 end
 private class ReduceAction199
 special ReduceAction
 end
 private class ReduceAction199
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -10178,7 +10178,7 @@ init do end
 end
 private class ReduceAction200
 special ReduceAction
 end
 private class ReduceAction200
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -10215,7 +10215,7 @@ init do end
 end
 private class ReduceAction201
 special ReduceAction
 end
 private class ReduceAction201
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -10269,7 +10269,7 @@ init do end
 end
 private class ReduceAction202
 special ReduceAction
 end
 private class ReduceAction202
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -10326,7 +10326,7 @@ init do end
 end
 private class ReduceAction203
 special ReduceAction
 end
 private class ReduceAction203
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -10373,7 +10373,7 @@ init do end
 end
 private class ReduceAction204
 special ReduceAction
 end
 private class ReduceAction204
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -10430,7 +10430,7 @@ init do end
 end
 private class ReduceAction205
 special ReduceAction
 end
 private class ReduceAction205
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -10490,7 +10490,7 @@ init do end
 end
 private class ReduceAction206
 special ReduceAction
 end
 private class ReduceAction206
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -10540,7 +10540,7 @@ init do end
 end
 private class ReduceAction207
 special ReduceAction
 end
 private class ReduceAction207
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -10587,7 +10587,7 @@ init do end
 end
 private class ReduceAction208
 special ReduceAction
 end
 private class ReduceAction208
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -10637,7 +10637,7 @@ init do end
 end
 private class ReduceAction209
 special ReduceAction
 end
 private class ReduceAction209
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -10677,7 +10677,7 @@ init do end
 end
 private class ReduceAction210
 special ReduceAction
 end
 private class ReduceAction210
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -10730,7 +10730,7 @@ init do end
 end
 private class ReduceAction211
 special ReduceAction
 end
 private class ReduceAction211
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -10786,7 +10786,7 @@ init do end
 end
 private class ReduceAction212
 special ReduceAction
 end
 private class ReduceAction212
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -10832,7 +10832,7 @@ init do end
 end
 private class ReduceAction213
 special ReduceAction
 end
 private class ReduceAction213
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -10888,7 +10888,7 @@ init do end
 end
 private class ReduceAction214
 special ReduceAction
 end
 private class ReduceAction214
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -10947,7 +10947,7 @@ init do end
 end
 private class ReduceAction215
 special ReduceAction
 end
 private class ReduceAction215
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -10996,7 +10996,7 @@ init do end
 end
 private class ReduceAction216
 special ReduceAction
 end
 private class ReduceAction216
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -11042,7 +11042,7 @@ init do end
 end
 private class ReduceAction217
 special ReduceAction
 end
 private class ReduceAction217
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -11091,7 +11091,7 @@ init do end
 end
 private class ReduceAction218
 special ReduceAction
 end
 private class ReduceAction218
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -11130,7 +11130,7 @@ init do end
 end
 private class ReduceAction219
 special ReduceAction
 end
 private class ReduceAction219
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -11186,7 +11186,7 @@ init do end
 end
 private class ReduceAction220
 special ReduceAction
 end
 private class ReduceAction220
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -11245,7 +11245,7 @@ init do end
 end
 private class ReduceAction221
 special ReduceAction
 end
 private class ReduceAction221
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -11294,7 +11294,7 @@ init do end
 end
 private class ReduceAction222
 special ReduceAction
 end
 private class ReduceAction222
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -11353,7 +11353,7 @@ init do end
 end
 private class ReduceAction223
 special ReduceAction
 end
 private class ReduceAction223
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -11415,7 +11415,7 @@ init do end
 end
 private class ReduceAction224
 special ReduceAction
 end
 private class ReduceAction224
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -11467,7 +11467,7 @@ init do end
 end
 private class ReduceAction225
 special ReduceAction
 end
 private class ReduceAction225
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -11516,7 +11516,7 @@ init do end
 end
 private class ReduceAction226
 special ReduceAction
 end
 private class ReduceAction226
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -11568,7 +11568,7 @@ init do end
 end
 private class ReduceAction227
 special ReduceAction
 end
 private class ReduceAction227
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -11610,7 +11610,7 @@ init do end
 end
 private class ReduceAction228
 special ReduceAction
 end
 private class ReduceAction228
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -11666,7 +11666,7 @@ init do end
 end
 private class ReduceAction229
 special ReduceAction
 end
 private class ReduceAction229
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -11725,7 +11725,7 @@ init do end
 end
 private class ReduceAction230
 special ReduceAction
 end
 private class ReduceAction230
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -11774,7 +11774,7 @@ init do end
 end
 private class ReduceAction231
 special ReduceAction
 end
 private class ReduceAction231
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -11833,7 +11833,7 @@ init do end
 end
 private class ReduceAction232
 special ReduceAction
 end
 private class ReduceAction232
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -11895,7 +11895,7 @@ init do end
 end
 private class ReduceAction233
 special ReduceAction
 end
 private class ReduceAction233
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -11947,7 +11947,7 @@ init do end
 end
 private class ReduceAction234
 special ReduceAction
 end
 private class ReduceAction234
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -11996,7 +11996,7 @@ init do end
 end
 private class ReduceAction235
 special ReduceAction
 end
 private class ReduceAction235
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -12048,7 +12048,7 @@ init do end
 end
 private class ReduceAction236
 special ReduceAction
 end
 private class ReduceAction236
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -12090,7 +12090,7 @@ init do end
 end
 private class ReduceAction237
 special ReduceAction
 end
 private class ReduceAction237
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -12149,7 +12149,7 @@ init do end
 end
 private class ReduceAction238
 special ReduceAction
 end
 private class ReduceAction238
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -12211,7 +12211,7 @@ init do end
 end
 private class ReduceAction239
 special ReduceAction
 end
 private class ReduceAction239
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -12263,7 +12263,7 @@ init do end
 end
 private class ReduceAction240
 special ReduceAction
 end
 private class ReduceAction240
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -12325,7 +12325,7 @@ init do end
 end
 private class ReduceAction241
 special ReduceAction
 end
 private class ReduceAction241
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist13 = p.pop

@@ -12390,7 +12390,7 @@ init do end
 end
 private class ReduceAction242
 special ReduceAction
 end
 private class ReduceAction242
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -12445,7 +12445,7 @@ init do end
 end
 private class ReduceAction243
 special ReduceAction
 end
 private class ReduceAction243
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -12497,7 +12497,7 @@ init do end
 end
 private class ReduceAction244
 special ReduceAction
 end
 private class ReduceAction244
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -12552,7 +12552,7 @@ init do end
 end
 private class ReduceAction245
 special ReduceAction
 end
 private class ReduceAction245
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -12597,7 +12597,7 @@ init do end
 end
 private class ReduceAction246
 special ReduceAction
 end
 private class ReduceAction246
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -12632,7 +12632,7 @@ init do end
 end
 private class ReduceAction247
 special ReduceAction
 end
 private class ReduceAction247
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -12670,7 +12670,7 @@ init do end
 end
 private class ReduceAction248
 special ReduceAction
 end
 private class ReduceAction248
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -12708,7 +12708,7 @@ init do end
 end
 private class ReduceAction249
 special ReduceAction
 end
 private class ReduceAction249
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -12749,7 +12749,7 @@ init do end
 end
 private class ReduceAction250
 special ReduceAction
 end
 private class ReduceAction250
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -12785,7 +12785,7 @@ init do end
 end
 private class ReduceAction251
 special ReduceAction
 end
 private class ReduceAction251
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -12824,7 +12824,7 @@ init do end
 end
 private class ReduceAction252
 special ReduceAction
 end
 private class ReduceAction252
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -12863,7 +12863,7 @@ init do end
 end
 private class ReduceAction253
 special ReduceAction
 end
 private class ReduceAction253
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -12905,7 +12905,7 @@ init do end
 end
 private class ReduceAction254
 special ReduceAction
 end
 private class ReduceAction254
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -12938,7 +12938,7 @@ init do end
 end
 private class ReduceAction255
 special ReduceAction
 end
 private class ReduceAction255
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -12974,7 +12974,7 @@ init do end
 end
 private class ReduceAction256
 special ReduceAction
 end
 private class ReduceAction256
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
        do
                                        var node_list: nullable Object = null
                                        var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(

@@ -12986,7 +12986,7 @@ init do end
 end
 private class ReduceAction257
 special ReduceAction
 end
 private class ReduceAction257
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13003,7 +13003,7 @@ init do end
 end
 private class ReduceAction258
 special ReduceAction
 end
 private class ReduceAction258
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13020,7 +13020,7 @@ init do end
 end
 private class ReduceAction259
 special ReduceAction
 end
 private class ReduceAction259
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13037,7 +13037,7 @@ init do end
 end
 private class ReduceAction260
 special ReduceAction
 end
 private class ReduceAction260
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13053,7 +13053,7 @@ init do end
 end
 private class ReduceAction261
 special ReduceAction
 end
 private class ReduceAction261
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13069,7 +13069,7 @@ init do end
 end
 private class ReduceAction262
 special ReduceAction
 end
 private class ReduceAction262
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13085,7 +13085,7 @@ init do end
 end
 private class ReduceAction263
 special ReduceAction
 end
 private class ReduceAction263
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13101,7 +13101,7 @@ init do end
 end
 private class ReduceAction264
 special ReduceAction
 end
 private class ReduceAction264
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13117,7 +13117,7 @@ init do end
 end
 private class ReduceAction265
 special ReduceAction
 end
 private class ReduceAction265
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13133,7 +13133,7 @@ init do end
 end
 private class ReduceAction266
 special ReduceAction
 end
 private class ReduceAction266
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13149,7 +13149,7 @@ init do end
 end
 private class ReduceAction267
 special ReduceAction
 end
 private class ReduceAction267
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13165,7 +13165,7 @@ init do end
 end
 private class ReduceAction268
 special ReduceAction
 end
 private class ReduceAction268
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13181,7 +13181,7 @@ init do end
 end
 private class ReduceAction269
 special ReduceAction
 end
 private class ReduceAction269
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13197,7 +13197,7 @@ init do end
 end
 private class ReduceAction270
 special ReduceAction
 end
 private class ReduceAction270
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13213,7 +13213,7 @@ init do end
 end
 private class ReduceAction271
 special ReduceAction
 end
 private class ReduceAction271
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13229,7 +13229,7 @@ init do end
 end
 private class ReduceAction272
 special ReduceAction
 end
 private class ReduceAction272
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13249,7 +13249,7 @@ init do end
 end
 private class ReduceAction273
 special ReduceAction
 end
 private class ReduceAction273
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13265,7 +13265,7 @@ init do end
 end
 private class ReduceAction274
 special ReduceAction
 end
 private class ReduceAction274
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13285,7 +13285,7 @@ init do end
 end
 private class ReduceAction275
 special ReduceAction
 end
 private class ReduceAction275
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13309,7 +13309,7 @@ init do end
 end
 private class ReduceAction276
 special ReduceAction
 end
 private class ReduceAction276
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13336,7 +13336,7 @@ init do end
 end
 private class ReduceAction277
 special ReduceAction
 end
 private class ReduceAction277
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13373,7 +13373,7 @@ init do end
 end
 private class ReduceAction278
 special ReduceAction
 end
 private class ReduceAction278
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13403,7 +13403,7 @@ init do end
 end
 private class ReduceAction279
 special ReduceAction
 end
 private class ReduceAction279
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13443,7 +13443,7 @@ init do end
 end
 private class ReduceAction280
 special ReduceAction
 end
 private class ReduceAction280
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13461,7 +13461,7 @@ init do end
 end
 private class ReduceAction281
 special ReduceAction
 end
 private class ReduceAction281
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13489,7 +13489,7 @@ init do end
 end
 private class ReduceAction282
 special ReduceAction
 end
 private class ReduceAction282
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13510,7 +13510,7 @@ init do end
 end
 private class ReduceAction283
 special ReduceAction
 end
 private class ReduceAction283
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13541,7 +13541,7 @@ init do end
 end
 private class ReduceAction284
 special ReduceAction
 end
 private class ReduceAction284
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var listnode2 = new Array[Object]
        do
                                        var node_list: nullable Object = null
                                        var listnode2 = new Array[Object]

@@ -13558,7 +13558,7 @@ init do end
 end
 private class ReduceAction285
 special ReduceAction
 end
 private class ReduceAction285
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13585,7 +13585,7 @@ init do end
 end
 private class ReduceAction286
 special ReduceAction
 end
 private class ReduceAction286
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13605,7 +13605,7 @@ init do end
 end
 private class ReduceAction287
 special ReduceAction
 end
 private class ReduceAction287
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13635,7 +13635,7 @@ init do end
 end
 private class ReduceAction288
 special ReduceAction
 end
 private class ReduceAction288
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -13656,7 +13656,7 @@ init do end
 end
 private class ReduceAction289
 special ReduceAction
 end
 private class ReduceAction289
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -13687,7 +13687,7 @@ init do end
 end
 private class ReduceAction290
 special ReduceAction
 end
 private class ReduceAction290
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13701,7 +13701,7 @@ init do end
 end
 private class ReduceAction291
 special ReduceAction
 end
 private class ReduceAction291
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13716,7 +13716,7 @@ init do end
 end
 private class ReduceAction292
 special ReduceAction
 end
 private class ReduceAction292
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13734,7 +13734,7 @@ init do end
 end
 private class ReduceAction293
 special ReduceAction
 end
 private class ReduceAction293
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13755,7 +13755,7 @@ init do end
 end
 private class ReduceAction294
 special ReduceAction
 end
 private class ReduceAction294
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -13779,7 +13779,7 @@ init do end
 end
 private class ReduceAction295
 special ReduceAction
 end
 private class ReduceAction295
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13801,7 +13801,7 @@ init do end
 end
 private class ReduceAction296
 special ReduceAction
 end
 private class ReduceAction296
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -13829,7 +13829,7 @@ init do end
 end
 private class ReduceAction297
 special ReduceAction
 end
 private class ReduceAction297
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -13860,7 +13860,7 @@ init do end
 end
 private class ReduceAction298
 special ReduceAction
 end
 private class ReduceAction298
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -13892,7 +13892,7 @@ init do end
 end
 private class ReduceAction299
 special ReduceAction
 end
 private class ReduceAction299
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -13927,7 +13927,7 @@ init do end
 end
 private class ReduceAction300
 special ReduceAction
 end
 private class ReduceAction300
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -13946,7 +13946,7 @@ init do end
 end
 private class ReduceAction301
 special ReduceAction
 end
 private class ReduceAction301
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -13968,7 +13968,7 @@ init do end
 end
 private class ReduceAction302
 special ReduceAction
 end
 private class ReduceAction302
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -14001,7 +14001,7 @@ init do end
 end
 private class ReduceAction303
 special ReduceAction
 end
 private class ReduceAction303
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -14037,7 +14037,7 @@ init do end
 end
 private class ReduceAction304
 special ReduceAction
 end
 private class ReduceAction304
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14054,7 +14054,7 @@ init do end
 end
 private class ReduceAction305
 special ReduceAction
 end
 private class ReduceAction305
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14081,7 +14081,7 @@ init do end
 end
 private class ReduceAction306
 special ReduceAction
 end
 private class ReduceAction306
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -14096,7 +14096,7 @@ init do end
 end
 private class ReduceAction307
 special ReduceAction
 end
 private class ReduceAction307
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -14111,7 +14111,7 @@ init do end
 end
 private class ReduceAction308
 special ReduceAction
 end
 private class ReduceAction308
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14124,7 +14124,7 @@ init do end
 end
 private class ReduceAction309
 special ReduceAction
 end
 private class ReduceAction309
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -14147,7 +14147,7 @@ init do end
 end
 private class ReduceAction310
 special ReduceAction
 end
 private class ReduceAction310
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -14180,7 +14180,7 @@ init do end
 end
 private class ReduceAction311
 special ReduceAction
 end
 private class ReduceAction311
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14196,7 +14196,7 @@ init do end
 end
 private class ReduceAction312
 special ReduceAction
 end
 private class ReduceAction312
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14211,7 +14211,7 @@ init do end
 end
 private class ReduceAction313
 special ReduceAction
 end
 private class ReduceAction313
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14225,7 +14225,7 @@ init do end
 end
 private class ReduceAction314
 special ReduceAction
 end
 private class ReduceAction314
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14238,7 +14238,7 @@ init do end
 end
 private class ReduceAction315
 special ReduceAction
 end
 private class ReduceAction315
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14251,7 +14251,7 @@ init do end
 end
 private class ReduceAction316
 special ReduceAction
 end
 private class ReduceAction316
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14268,7 +14268,7 @@ init do end
 end
 private class ReduceAction317
 special ReduceAction
 end
 private class ReduceAction317
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14288,7 +14288,7 @@ init do end
 end
 private class ReduceAction318
 special ReduceAction
 end
 private class ReduceAction318
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14305,7 +14305,7 @@ init do end
 end
 private class ReduceAction319
 special ReduceAction
 end
 private class ReduceAction319
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14325,7 +14325,7 @@ init do end
 end
 private class ReduceAction320
 special ReduceAction
 end
 private class ReduceAction320
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14341,7 +14341,7 @@ init do end
 end
 private class ReduceAction321
 special ReduceAction
 end
 private class ReduceAction321
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14358,7 +14358,7 @@ init do end
 end
 private class ReduceAction322
 special ReduceAction
 end
 private class ReduceAction322
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14378,7 +14378,7 @@ init do end
 end
 private class ReduceAction323
 special ReduceAction
 end
 private class ReduceAction323
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14391,7 +14391,7 @@ init do end
 end
 private class ReduceAction324
 special ReduceAction
 end
 private class ReduceAction324
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14404,7 +14404,7 @@ init do end
 end
 private class ReduceAction325
 special ReduceAction
 end
 private class ReduceAction325
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14417,7 +14417,7 @@ init do end
 end
 private class ReduceAction326
 special ReduceAction
 end
 private class ReduceAction326
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14430,7 +14430,7 @@ init do end
 end
 private class ReduceAction327
 special ReduceAction
 end
 private class ReduceAction327
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14443,7 +14443,7 @@ init do end
 end
 private class ReduceAction328
 special ReduceAction
 end
 private class ReduceAction328
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -14479,7 +14479,7 @@ init do end
 end
 private class ReduceAction329
 special ReduceAction
 end
 private class ReduceAction329
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14512,7 +14512,7 @@ init do end
 end
 private class ReduceAction330
 special ReduceAction
 end
 private class ReduceAction330
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -14558,7 +14558,7 @@ init do end
 end
 private class ReduceAction331
 special ReduceAction
 end
 private class ReduceAction331
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -14601,7 +14601,7 @@ init do end
 end
 private class ReduceAction332
 special ReduceAction
 end
 private class ReduceAction332
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14630,7 +14630,7 @@ init do end
 end
 private class ReduceAction333
 special ReduceAction
 end
 private class ReduceAction333
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -14662,7 +14662,7 @@ init do end
 end
 private class ReduceAction334
 special ReduceAction
 end
 private class ReduceAction334
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -14696,7 +14696,7 @@ init do end
 end
 private class ReduceAction335
 special ReduceAction
 end
 private class ReduceAction335
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14727,7 +14727,7 @@ init do end
 end
 private class ReduceAction336
 special ReduceAction
 end
 private class ReduceAction336
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -14744,7 +14744,7 @@ init do end
 end
 private class ReduceAction337
 special ReduceAction
 end
 private class ReduceAction337
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -14771,7 +14771,7 @@ init do end
 end
 private class ReduceAction338
 special ReduceAction
 end
 private class ReduceAction338
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -14797,7 +14797,7 @@ init do end
 end
 private class ReduceAction339
 special ReduceAction
 end
 private class ReduceAction339
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -14833,7 +14833,7 @@ init do end
 end
 private class ReduceAction340
 special ReduceAction
 end
 private class ReduceAction340
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -14868,7 +14868,7 @@ init do end
 end
 private class ReduceAction341
 special ReduceAction
 end
 private class ReduceAction341
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -14913,7 +14913,7 @@ init do end
 end
 private class ReduceAction342
 special ReduceAction
 end
 private class ReduceAction342
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -14958,7 +14958,7 @@ init do end
 end
 private class ReduceAction343
 special ReduceAction
 end
 private class ReduceAction343
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -15013,7 +15013,7 @@ init do end
 end
 private class ReduceAction344
 special ReduceAction
 end
 private class ReduceAction344
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -15037,7 +15037,7 @@ init do end
 end
 private class ReduceAction345
 special ReduceAction
 end
 private class ReduceAction345
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -15071,7 +15071,7 @@ init do end
 end
 private class ReduceAction346
 special ReduceAction
 end
 private class ReduceAction346
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -15094,7 +15094,7 @@ init do end
 end
 private class ReduceAction347
 special ReduceAction
 end
 private class ReduceAction347
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -15120,7 +15120,7 @@ init do end
 end
 private class ReduceAction348
 special ReduceAction
 end
 private class ReduceAction348
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -15150,7 +15150,7 @@ init do end
 end
 private class ReduceAction349
 special ReduceAction
 end
 private class ReduceAction349
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15183,7 +15183,7 @@ init do end
 end
 private class ReduceAction350
 special ReduceAction
 end
 private class ReduceAction350
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15213,7 +15213,7 @@ init do end
 end
 private class ReduceAction351
 special ReduceAction
 end
 private class ReduceAction351
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -15240,7 +15240,7 @@ init do end
 end
 private class ReduceAction352
 special ReduceAction
 end
 private class ReduceAction352
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -15282,7 +15282,7 @@ init do end
 end
 private class ReduceAction353
 special ReduceAction
 end
 private class ReduceAction353
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -15321,7 +15321,7 @@ init do end
 end
 private class ReduceAction354
 special ReduceAction
 end
 private class ReduceAction354
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -15357,7 +15357,7 @@ init do end
 end
 private class ReduceAction355
 special ReduceAction
 end
 private class ReduceAction355
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15387,7 +15387,7 @@ init do end
 end
 private class ReduceAction356
 special ReduceAction
 end
 private class ReduceAction356
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -15414,7 +15414,7 @@ init do end
 end
 private class ReduceAction357
 special ReduceAction
 end
 private class ReduceAction357
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -15456,7 +15456,7 @@ init do end
 end
 private class ReduceAction358
 special ReduceAction
 end
 private class ReduceAction358
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -15495,7 +15495,7 @@ init do end
 end
 private class ReduceAction359
 special ReduceAction
 end
 private class ReduceAction359
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -15531,7 +15531,7 @@ init do end
 end
 private class ReduceAction360
 special ReduceAction
 end
 private class ReduceAction360
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -15547,7 +15547,7 @@ init do end
 end
 private class ReduceAction361
 special ReduceAction
 end
 private class ReduceAction361
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -15563,7 +15563,7 @@ init do end
 end
 private class ReduceAction362
 special ReduceAction
 end
 private class ReduceAction362
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -15583,7 +15583,7 @@ init do end
 end
 private class ReduceAction363
 special ReduceAction
 end
 private class ReduceAction363
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -15615,7 +15615,7 @@ init do end
 end
 private class ReduceAction364
 special ReduceAction
 end
 private class ReduceAction364
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15643,7 +15643,7 @@ init do end
 end
 private class ReduceAction365
 special ReduceAction
 end
 private class ReduceAction365
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -15683,7 +15683,7 @@ init do end
 end
 private class ReduceAction366
 special ReduceAction
 end
 private class ReduceAction366
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -15733,7 +15733,7 @@ init do end
 end
 private class ReduceAction367
 special ReduceAction
 end
 private class ReduceAction367
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15761,7 +15761,7 @@ init do end
 end
 private class ReduceAction368
 special ReduceAction
 end
 private class ReduceAction368
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -15790,7 +15790,7 @@ init do end
 end
 private class ReduceAction369
 special ReduceAction
 end
 private class ReduceAction369
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -15804,7 +15804,7 @@ init do end
 end
 private class ReduceAction370
 special ReduceAction
 end
 private class ReduceAction370
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -15815,7 +15815,7 @@ init do end
 end
 private class ReduceAction371
 special ReduceAction
 end
 private class ReduceAction371
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -15845,7 +15845,7 @@ init do end
 end
 private class ReduceAction372
 special ReduceAction
 end
 private class ReduceAction372
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -15882,7 +15882,7 @@ init do end
 end
 private class ReduceAction373
 special ReduceAction
 end
 private class ReduceAction373
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -15903,7 +15903,7 @@ init do end
 end
 private class ReduceAction374
 special ReduceAction
 end
 private class ReduceAction374
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -15927,7 +15927,7 @@ init do end
 end
 private class ReduceAction375
 special ReduceAction
 end
 private class ReduceAction375
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -15941,7 +15941,7 @@ init do end
 end
 private class ReduceAction376
 special ReduceAction
 end
 private class ReduceAction376
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -15954,7 +15954,7 @@ init do end
 end
 private class ReduceAction377
 special ReduceAction
 end
 private class ReduceAction377
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -16000,7 +16000,7 @@ init do end
 end
 private class ReduceAction378
 special ReduceAction
 end
 private class ReduceAction378
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16043,7 +16043,7 @@ init do end
 end
 private class ReduceAction379
 special ReduceAction
 end
 private class ReduceAction379
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16083,7 +16083,7 @@ init do end
 end
 private class ReduceAction380
 special ReduceAction
 end
 private class ReduceAction380
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16096,7 +16096,7 @@ init do end
 end
 private class ReduceAction381
 special ReduceAction
 end
 private class ReduceAction381
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -16137,7 +16137,7 @@ init do end
 end
 private class ReduceAction382
 special ReduceAction
 end
 private class ReduceAction382
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16150,7 +16150,7 @@ init do end
 end
 private class ReduceAction383
 special ReduceAction
 end
 private class ReduceAction383
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16172,7 +16172,7 @@ init do end
 end
 private class ReduceAction384
 special ReduceAction
 end
 private class ReduceAction384
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16194,7 +16194,7 @@ init do end
 end
 private class ReduceAction385
 special ReduceAction
 end
 private class ReduceAction385
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16207,7 +16207,7 @@ init do end
 end
 private class ReduceAction386
 special ReduceAction
 end
 private class ReduceAction386
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16228,7 +16228,7 @@ init do end
 end
 private class ReduceAction387
 special ReduceAction
 end
 private class ReduceAction387
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16241,7 +16241,7 @@ init do end
 end
 private class ReduceAction388
 special ReduceAction
 end
 private class ReduceAction388
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16263,7 +16263,7 @@ init do end
 end
 private class ReduceAction389
 special ReduceAction
 end
 private class ReduceAction389
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16285,7 +16285,7 @@ init do end
 end
 private class ReduceAction390
 special ReduceAction
 end
 private class ReduceAction390
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16307,7 +16307,7 @@ init do end
 end
 private class ReduceAction391
 special ReduceAction
 end
 private class ReduceAction391
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16329,7 +16329,7 @@ init do end
 end
 private class ReduceAction392
 special ReduceAction
 end
 private class ReduceAction392
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16351,7 +16351,7 @@ init do end
 end
 private class ReduceAction393
 special ReduceAction
 end
 private class ReduceAction393
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16373,7 +16373,7 @@ init do end
 end
 private class ReduceAction394
 special ReduceAction
 end
 private class ReduceAction394
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16395,7 +16395,7 @@ init do end
 end
 private class ReduceAction395
 special ReduceAction
 end
 private class ReduceAction395
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16417,7 +16417,7 @@ init do end
 end
 private class ReduceAction396
 special ReduceAction
 end
 private class ReduceAction396
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16439,7 +16439,7 @@ init do end
 end
 private class ReduceAction397
 special ReduceAction
 end
 private class ReduceAction397
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16452,7 +16452,7 @@ init do end
 end
 private class ReduceAction398
 special ReduceAction
 end
 private class ReduceAction398
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16474,7 +16474,7 @@ init do end
 end
 private class ReduceAction399
 special ReduceAction
 end
 private class ReduceAction399
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16496,7 +16496,7 @@ init do end
 end
 private class ReduceAction400
 special ReduceAction
 end
 private class ReduceAction400
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16509,7 +16509,7 @@ init do end
 end
 private class ReduceAction401
 special ReduceAction
 end
 private class ReduceAction401
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16531,7 +16531,7 @@ init do end
 end
 private class ReduceAction402
 special ReduceAction
 end
 private class ReduceAction402
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16553,7 +16553,7 @@ init do end
 end
 private class ReduceAction403
 special ReduceAction
 end
 private class ReduceAction403
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16575,7 +16575,7 @@ init do end
 end
 private class ReduceAction404
 special ReduceAction
 end
 private class ReduceAction404
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16588,7 +16588,7 @@ init do end
 end
 private class ReduceAction405
 special ReduceAction
 end
 private class ReduceAction405
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16609,7 +16609,7 @@ init do end
 end
 private class ReduceAction406
 special ReduceAction
 end
 private class ReduceAction406
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16630,7 +16630,7 @@ init do end
 end
 private class ReduceAction407
 special ReduceAction
 end
 private class ReduceAction407
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16643,7 +16643,7 @@ init do end
 end
 private class ReduceAction408
 special ReduceAction
 end
 private class ReduceAction408
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16677,7 +16677,7 @@ init do end
 end
 private class ReduceAction409
 special ReduceAction
 end
 private class ReduceAction409
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -16703,7 +16703,7 @@ init do end
 end
 private class ReduceAction410
 special ReduceAction
 end
 private class ReduceAction410
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -16726,7 +16726,7 @@ init do end
 end
 private class ReduceAction411
 special ReduceAction
 end
 private class ReduceAction411
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -16748,7 +16748,7 @@ init do end
 end
 private class ReduceAction412
 special ReduceAction
 end
 private class ReduceAction412
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -16767,7 +16767,7 @@ init do end
 end
 private class ReduceAction413
 special ReduceAction
 end
 private class ReduceAction413
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -16803,7 +16803,7 @@ init do end
 end
 private class ReduceAction414
 special ReduceAction
 end
 private class ReduceAction414
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -16836,7 +16836,7 @@ init do end
 end
 private class ReduceAction415
 special ReduceAction
 end
 private class ReduceAction415
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -16865,7 +16865,7 @@ init do end
 end
 private class ReduceAction416
 special ReduceAction
 end
 private class ReduceAction416
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -16897,7 +16897,7 @@ init do end
 end
 private class ReduceAction417
 special ReduceAction
 end
 private class ReduceAction417
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -16931,7 +16931,7 @@ init do end
 end
 private class ReduceAction418
 special ReduceAction
 end
 private class ReduceAction418
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -16962,7 +16962,7 @@ init do end
 end
 private class ReduceAction419
 special ReduceAction
 end
 private class ReduceAction419
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -16992,7 +16992,7 @@ init do end
 end
 private class ReduceAction420
 special ReduceAction
 end
 private class ReduceAction420
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -17031,7 +17031,7 @@ init do end
 end
 private class ReduceAction421
 special ReduceAction
 end
 private class ReduceAction421
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -17058,7 +17058,7 @@ init do end
 end
 private class ReduceAction422
 special ReduceAction
 end
 private class ReduceAction422
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -17085,7 +17085,7 @@ init do end
 end
 private class ReduceAction423
 special ReduceAction
 end
 private class ReduceAction423
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17109,7 +17109,7 @@ init do end
 end
 private class ReduceAction424
 special ReduceAction
 end
 private class ReduceAction424
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17125,7 +17125,7 @@ init do end
 end
 private class ReduceAction425
 special ReduceAction
 end
 private class ReduceAction425
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17141,7 +17141,7 @@ init do end
 end
 private class ReduceAction426
 special ReduceAction
 end
 private class ReduceAction426
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17157,7 +17157,7 @@ init do end
 end
 private class ReduceAction427
 special ReduceAction
 end
 private class ReduceAction427
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17173,7 +17173,7 @@ init do end
 end
 private class ReduceAction428
 special ReduceAction
 end
 private class ReduceAction428
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17189,7 +17189,7 @@ init do end
 end
 private class ReduceAction429
 special ReduceAction
 end
 private class ReduceAction429
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17205,7 +17205,7 @@ init do end
 end
 private class ReduceAction430
 special ReduceAction
 end
 private class ReduceAction430
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17221,7 +17221,7 @@ init do end
 end
 private class ReduceAction431
 special ReduceAction
 end
 private class ReduceAction431
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17237,7 +17237,7 @@ init do end
 end
 private class ReduceAction432
 special ReduceAction
 end
 private class ReduceAction432
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17250,7 +17250,7 @@ init do end
 end
 private class ReduceAction433
 special ReduceAction
 end
 private class ReduceAction433
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17265,7 +17265,7 @@ init do end
 end
 private class ReduceAction434
 special ReduceAction
 end
 private class ReduceAction434
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -17296,7 +17296,7 @@ init do end
 end
 private class ReduceAction435
 special ReduceAction
 end
 private class ReduceAction435
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -17332,7 +17332,7 @@ init do end
 end
 private class ReduceAction436
 special ReduceAction
 end
 private class ReduceAction436
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -17362,7 +17362,7 @@ init do end
 end
 private class ReduceAction437
 special ReduceAction
 end
 private class ReduceAction437
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17402,7 +17402,7 @@ init do end
 end
 private class ReduceAction438
 special ReduceAction
 end
 private class ReduceAction438
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -17427,7 +17427,7 @@ init do end
 end
 private class ReduceAction439
 special ReduceAction
 end
 private class ReduceAction439
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17443,7 +17443,7 @@ init do end
 end
 private class ReduceAction440
 special ReduceAction
 end
 private class ReduceAction440
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -17468,7 +17468,7 @@ init do end
 end
 private class ReduceAction441
 special ReduceAction
 end
 private class ReduceAction441
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17484,7 +17484,7 @@ init do end
 end
 private class ReduceAction442
 special ReduceAction
 end
 private class ReduceAction442
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17500,7 +17500,7 @@ init do end
 end
 private class ReduceAction443
 special ReduceAction
 end
 private class ReduceAction443
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -17521,7 +17521,7 @@ init do end
 end
 private class ReduceAction444
 special ReduceAction
 end
 private class ReduceAction444
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -17552,7 +17552,7 @@ init do end
 end
 private class ReduceAction445
 special ReduceAction
 end
 private class ReduceAction445
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17566,7 +17566,7 @@ init do end
 end
 private class ReduceAction446
 special ReduceAction
 end
 private class ReduceAction446
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var listnode1 = new Array[Object]
        do
                                        var node_list: nullable Object = null
                                        var listnode1 = new Array[Object]

@@ -17577,7 +17577,7 @@ init do end
 end
 private class ReduceAction447
 special ReduceAction
 end
 private class ReduceAction447
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -17598,7 +17598,7 @@ init do end
 end
 private class ReduceAction448
 special ReduceAction
 end
 private class ReduceAction448
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -17629,7 +17629,7 @@ init do end
 end
 private class ReduceAction449
 special ReduceAction
 end
 private class ReduceAction449
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17646,7 +17646,7 @@ init do end
 end
 private class ReduceAction450
 special ReduceAction
 end
 private class ReduceAction450
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17660,7 +17660,7 @@ init do end
 end
 private class ReduceAction451
 special ReduceAction
 end
 private class ReduceAction451
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var listnode1 = new Array[Object]
        do
                                        var node_list: nullable Object = null
                                        var listnode1 = new Array[Object]

@@ -17671,7 +17671,7 @@ init do end
 end
 private class ReduceAction452
 special ReduceAction
 end
 private class ReduceAction452
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -17692,7 +17692,7 @@ init do end
 end
 private class ReduceAction453
 special ReduceAction
 end
 private class ReduceAction453
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -17723,7 +17723,7 @@ init do end
 end
 private class ReduceAction454
 special ReduceAction
 end
 private class ReduceAction454
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -17739,7 +17739,7 @@ init do end
 end
 private class ReduceAction455
 special ReduceAction
 end
 private class ReduceAction455
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17756,7 +17756,7 @@ init do end
 end
 private class ReduceAction456
 special ReduceAction
 end
 private class ReduceAction456
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -17786,7 +17786,7 @@ init do end
 end
 private class ReduceAction457
 special ReduceAction
 end
 private class ReduceAction457
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17804,7 +17804,7 @@ init do end
 end
 private class ReduceAction458
 special ReduceAction
 end
 private class ReduceAction458
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -17832,7 +17832,7 @@ init do end
 end
 private class ReduceAction459
 special ReduceAction
 end
 private class ReduceAction459
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17857,7 +17857,7 @@ init do end
 end
 private class ReduceAction460
 special ReduceAction
 end
 private class ReduceAction460
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17872,7 +17872,7 @@ init do end
 end
 private class ReduceAction461
 special ReduceAction
 end
 private class ReduceAction461
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -17887,7 +17887,7 @@ init do end
 end
 private class ReduceAction462
 special ReduceAction
 end
 private class ReduceAction462
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17897,7 +17897,7 @@ init do end
 end
 private class ReduceAction463
 special ReduceAction
 end
 private class ReduceAction463
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17907,7 +17907,7 @@ init do end
 end
 private class ReduceAction464
 special ReduceAction
 end
 private class ReduceAction464
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17931,7 +17931,7 @@ init do end
 end
 private class ReduceAction465
 special ReduceAction
 end
 private class ReduceAction465
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -17956,7 +17956,7 @@ init do end
 end
 private class ReduceAction466
 special ReduceAction
 end
 private class ReduceAction466
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17967,7 +17967,7 @@ init do end
 end
 private class ReduceAction467
 special ReduceAction
 end
 private class ReduceAction467
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        node_list = null
        do
                                        var node_list: nullable Object = null
                                        node_list = null

@@ -17977,7 +17977,7 @@ init do end
 end
 private class ReduceAction468
 special ReduceAction
 end
 private class ReduceAction468
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -17990,7 +17990,7 @@ init do end
 end
 private class ReduceAction469
 special ReduceAction
 end
 private class ReduceAction469
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -18001,7 +18001,7 @@ init do end
 end
 private class ReduceAction470
 special ReduceAction
 end
 private class ReduceAction470
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -18013,7 +18013,7 @@ init do end
 end
 private class ReduceAction471
 special ReduceAction
 end
 private class ReduceAction471
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18023,7 +18023,7 @@ init do end
 end
 private class ReduceAction472
 special ReduceAction
 end
 private class ReduceAction472
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -18037,7 +18037,7 @@ init do end
 end
 private class ReduceAction473
 special ReduceAction
 end
 private class ReduceAction473
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -18075,7 +18075,7 @@ init do end
 end
 private class ReduceAction474
 special ReduceAction
 end
 private class ReduceAction474
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -18116,7 +18116,7 @@ init do end
 end
 private class ReduceAction475
 special ReduceAction
 end
 private class ReduceAction475
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -18155,7 +18155,7 @@ init do end
 end
 private class ReduceAction476
 special ReduceAction
 end
 private class ReduceAction476
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -18197,7 +18197,7 @@ init do end
 end
 private class ReduceAction477
 special ReduceAction
 end
 private class ReduceAction477
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -18233,7 +18233,7 @@ init do end
 end
 private class ReduceAction478
 special ReduceAction
 end
 private class ReduceAction478
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -18272,7 +18272,7 @@ init do end
 end
 private class ReduceAction479
 special ReduceAction
 end
 private class ReduceAction479
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -18311,7 +18311,7 @@ init do end
 end
 private class ReduceAction480
 special ReduceAction
 end
 private class ReduceAction480
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist9 = p.pop

@@ -18353,7 +18353,7 @@ init do end
 end
 private class ReduceAction481
 special ReduceAction
 end
 private class ReduceAction481
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18372,7 +18372,7 @@ init do end
 end
 private class ReduceAction482
 special ReduceAction
 end
 private class ReduceAction482
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -18394,7 +18394,7 @@ init do end
 end
 private class ReduceAction483
 special ReduceAction
 end
 private class ReduceAction483
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18407,7 +18407,7 @@ init do end
 end
 private class ReduceAction484
 special ReduceAction
 end
 private class ReduceAction484
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -18453,7 +18453,7 @@ init do end
 end
 private class ReduceAction485
 special ReduceAction
 end
 private class ReduceAction485
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -18496,7 +18496,7 @@ init do end
 end
 private class ReduceAction486
 special ReduceAction
 end
 private class ReduceAction486
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18509,7 +18509,7 @@ init do end
 end
 private class ReduceAction487
 special ReduceAction
 end
 private class ReduceAction487
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -18550,7 +18550,7 @@ init do end
 end
 private class ReduceAction488
 special ReduceAction
 end
 private class ReduceAction488
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18563,7 +18563,7 @@ init do end
 end
 private class ReduceAction489
 special ReduceAction
 end
 private class ReduceAction489
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18585,7 +18585,7 @@ init do end
 end
 private class ReduceAction490
 special ReduceAction
 end
 private class ReduceAction490
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18607,7 +18607,7 @@ init do end
 end
 private class ReduceAction491
 special ReduceAction
 end
 private class ReduceAction491
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18620,7 +18620,7 @@ init do end
 end
 private class ReduceAction492
 special ReduceAction
 end
 private class ReduceAction492
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -18641,7 +18641,7 @@ init do end
 end
 private class ReduceAction493
 special ReduceAction
 end
 private class ReduceAction493
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18654,7 +18654,7 @@ init do end
 end
 private class ReduceAction494
 special ReduceAction
 end
 private class ReduceAction494
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18676,7 +18676,7 @@ init do end
 end
 private class ReduceAction495
 special ReduceAction
 end
 private class ReduceAction495
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18698,7 +18698,7 @@ init do end
 end
 private class ReduceAction496
 special ReduceAction
 end
 private class ReduceAction496
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18720,7 +18720,7 @@ init do end
 end
 private class ReduceAction497
 special ReduceAction
 end
 private class ReduceAction497
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18742,7 +18742,7 @@ init do end
 end
 private class ReduceAction498
 special ReduceAction
 end
 private class ReduceAction498
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18764,7 +18764,7 @@ init do end
 end
 private class ReduceAction499
 special ReduceAction
 end
 private class ReduceAction499
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18786,7 +18786,7 @@ init do end
 end
 private class ReduceAction500
 special ReduceAction
 end
 private class ReduceAction500
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18808,7 +18808,7 @@ init do end
 end
 private class ReduceAction501
 special ReduceAction
 end
 private class ReduceAction501
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18830,7 +18830,7 @@ init do end
 end
 private class ReduceAction502
 special ReduceAction
 end
 private class ReduceAction502
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18852,7 +18852,7 @@ init do end
 end
 private class ReduceAction503
 special ReduceAction
 end
 private class ReduceAction503
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18865,7 +18865,7 @@ init do end
 end
 private class ReduceAction504
 special ReduceAction
 end
 private class ReduceAction504
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18887,7 +18887,7 @@ init do end
 end
 private class ReduceAction505
 special ReduceAction
 end
 private class ReduceAction505
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18909,7 +18909,7 @@ init do end
 end
 private class ReduceAction506
 special ReduceAction
 end
 private class ReduceAction506
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -18922,7 +18922,7 @@ init do end
 end
 private class ReduceAction507
 special ReduceAction
 end
 private class ReduceAction507
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18944,7 +18944,7 @@ init do end
 end
 private class ReduceAction508
 special ReduceAction
 end
 private class ReduceAction508
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18966,7 +18966,7 @@ init do end
 end
 private class ReduceAction509
 special ReduceAction
 end
 private class ReduceAction509
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -18988,7 +18988,7 @@ init do end
 end
 private class ReduceAction510
 special ReduceAction
 end
 private class ReduceAction510
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19001,7 +19001,7 @@ init do end
 end
 private class ReduceAction511
 special ReduceAction
 end
 private class ReduceAction511
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -19022,7 +19022,7 @@ init do end
 end
 private class ReduceAction512
 special ReduceAction
 end
 private class ReduceAction512
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -19043,7 +19043,7 @@ init do end
 end
 private class ReduceAction513
 special ReduceAction
 end
 private class ReduceAction513
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19056,7 +19056,7 @@ init do end
 end
 private class ReduceAction514
 special ReduceAction
 end
 private class ReduceAction514
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -19090,7 +19090,7 @@ init do end
 end
 private class ReduceAction515
 special ReduceAction
 end
 private class ReduceAction515
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -19116,7 +19116,7 @@ init do end
 end
 private class ReduceAction516
 special ReduceAction
 end
 private class ReduceAction516
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19139,7 +19139,7 @@ init do end
 end
 private class ReduceAction517
 special ReduceAction
 end
 private class ReduceAction517
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -19161,7 +19161,7 @@ init do end
 end
 private class ReduceAction518
 special ReduceAction
 end
 private class ReduceAction518
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19180,7 +19180,7 @@ init do end
 end
 private class ReduceAction519
 special ReduceAction
 end
 private class ReduceAction519
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -19216,7 +19216,7 @@ init do end
 end
 private class ReduceAction520
 special ReduceAction
 end
 private class ReduceAction520
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19249,7 +19249,7 @@ init do end
 end
 private class ReduceAction521
 special ReduceAction
 end
 private class ReduceAction521
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19278,7 +19278,7 @@ init do end
 end
 private class ReduceAction522
 special ReduceAction
 end
 private class ReduceAction522
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -19310,7 +19310,7 @@ init do end
 end
 private class ReduceAction523
 special ReduceAction
 end
 private class ReduceAction523
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -19344,7 +19344,7 @@ init do end
 end
 private class ReduceAction524
 special ReduceAction
 end
 private class ReduceAction524
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19375,7 +19375,7 @@ init do end
 end
 private class ReduceAction525
 special ReduceAction
 end
 private class ReduceAction525
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -19414,7 +19414,7 @@ init do end
 end
 private class ReduceAction526
 special ReduceAction
 end
 private class ReduceAction526
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19430,7 +19430,7 @@ init do end
 end
 private class ReduceAction527
 special ReduceAction
 end
 private class ReduceAction527
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19446,7 +19446,7 @@ init do end
 end
 private class ReduceAction528
 special ReduceAction
 end
 private class ReduceAction528
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19462,7 +19462,7 @@ init do end
 end
 private class ReduceAction529
 special ReduceAction
 end
 private class ReduceAction529
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19478,7 +19478,7 @@ init do end
 end
 private class ReduceAction530
 special ReduceAction
 end
 private class ReduceAction530
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19494,7 +19494,7 @@ init do end
 end
 private class ReduceAction531
 special ReduceAction
 end
 private class ReduceAction531
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19510,7 +19510,7 @@ init do end
 end
 private class ReduceAction532
 special ReduceAction
 end
 private class ReduceAction532
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19526,7 +19526,7 @@ init do end
 end
 private class ReduceAction533
 special ReduceAction
 end
 private class ReduceAction533
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19542,7 +19542,7 @@ init do end
 end
 private class ReduceAction534
 special ReduceAction
 end
 private class ReduceAction534
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19555,7 +19555,7 @@ init do end
 end
 private class ReduceAction535
 special ReduceAction
 end
 private class ReduceAction535
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -19570,7 +19570,7 @@ init do end
 end
 private class ReduceAction536
 special ReduceAction
 end
 private class ReduceAction536
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -19601,7 +19601,7 @@ init do end
 end
 private class ReduceAction537
 special ReduceAction
 end
 private class ReduceAction537
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -19637,7 +19637,7 @@ init do end
 end
 private class ReduceAction538
 special ReduceAction
 end
 private class ReduceAction538
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19650,7 +19650,7 @@ init do end
 end
 private class ReduceAction539
 special ReduceAction
 end
 private class ReduceAction539
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -19673,7 +19673,7 @@ init do end
 end
 private class ReduceAction540
 special ReduceAction
 end
 private class ReduceAction540
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -19706,7 +19706,7 @@ init do end
 end
 private class ReduceAction541
 special ReduceAction
 end
 private class ReduceAction541
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19722,7 +19722,7 @@ init do end
 end
 private class ReduceAction542
 special ReduceAction
 end
 private class ReduceAction542
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19737,7 +19737,7 @@ init do end
 end
 private class ReduceAction543
 special ReduceAction
 end
 private class ReduceAction543
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19750,7 +19750,7 @@ init do end
 end
 private class ReduceAction544
 special ReduceAction
 end
 private class ReduceAction544
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19763,7 +19763,7 @@ init do end
 end
 private class ReduceAction545
 special ReduceAction
 end
 private class ReduceAction545
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19780,7 +19780,7 @@ init do end
 end
 private class ReduceAction546
 special ReduceAction
 end
 private class ReduceAction546
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19800,7 +19800,7 @@ init do end
 end
 private class ReduceAction547
 special ReduceAction
 end
 private class ReduceAction547
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19817,7 +19817,7 @@ init do end
 end
 private class ReduceAction548
 special ReduceAction
 end
 private class ReduceAction548
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19837,7 +19837,7 @@ init do end
 end
 private class ReduceAction549
 special ReduceAction
 end
 private class ReduceAction549
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19853,7 +19853,7 @@ init do end
 end
 private class ReduceAction550
 special ReduceAction
 end
 private class ReduceAction550
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19870,7 +19870,7 @@ init do end
 end
 private class ReduceAction551
 special ReduceAction
 end
 private class ReduceAction551
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -19890,7 +19890,7 @@ init do end
 end
 private class ReduceAction552
 special ReduceAction
 end
 private class ReduceAction552
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19903,7 +19903,7 @@ init do end
 end
 private class ReduceAction553
 special ReduceAction
 end
 private class ReduceAction553
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19916,7 +19916,7 @@ init do end
 end
 private class ReduceAction554
 special ReduceAction
 end
 private class ReduceAction554
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19929,7 +19929,7 @@ init do end
 end
 private class ReduceAction555
 special ReduceAction
 end
 private class ReduceAction555
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19942,7 +19942,7 @@ init do end
 end
 private class ReduceAction556
 special ReduceAction
 end
 private class ReduceAction556
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -19955,7 +19955,7 @@ init do end
 end
 private class ReduceAction557
 special ReduceAction
 end
 private class ReduceAction557
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -19991,7 +19991,7 @@ init do end
 end
 private class ReduceAction558
 special ReduceAction
 end
 private class ReduceAction558
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20024,7 +20024,7 @@ init do end
 end
 private class ReduceAction559
 special ReduceAction
 end
 private class ReduceAction559
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -20070,7 +20070,7 @@ init do end
 end
 private class ReduceAction560
 special ReduceAction
 end
 private class ReduceAction560
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20113,7 +20113,7 @@ init do end
 end
 private class ReduceAction561
 special ReduceAction
 end
 private class ReduceAction561
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20142,7 +20142,7 @@ init do end
 end
 private class ReduceAction562
 special ReduceAction
 end
 private class ReduceAction562
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20174,7 +20174,7 @@ init do end
 end
 private class ReduceAction563
 special ReduceAction
 end
 private class ReduceAction563
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -20208,7 +20208,7 @@ init do end
 end
 private class ReduceAction564
 special ReduceAction
 end
 private class ReduceAction564
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20239,7 +20239,7 @@ init do end
 end
 private class ReduceAction565
 special ReduceAction
 end
 private class ReduceAction565
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -20256,7 +20256,7 @@ init do end
 end
 private class ReduceAction566
 special ReduceAction
 end
 private class ReduceAction566
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20283,7 +20283,7 @@ init do end
 end
 private class ReduceAction567
 special ReduceAction
 end
 private class ReduceAction567
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20309,7 +20309,7 @@ init do end
 end
 private class ReduceAction568
 special ReduceAction
 end
 private class ReduceAction568
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -20345,7 +20345,7 @@ init do end
 end
 private class ReduceAction569
 special ReduceAction
 end
 private class ReduceAction569
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20368,7 +20368,7 @@ init do end
 end
 private class ReduceAction570
 special ReduceAction
 end
 private class ReduceAction570
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20394,7 +20394,7 @@ init do end
 end
 private class ReduceAction571
 special ReduceAction
 end
 private class ReduceAction571
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -20424,7 +20424,7 @@ init do end
 end
 private class ReduceAction572
 special ReduceAction
 end
 private class ReduceAction572
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -20457,7 +20457,7 @@ init do end
 end
 private class ReduceAction573
 special ReduceAction
 end
 private class ReduceAction573
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -20487,7 +20487,7 @@ init do end
 end
 private class ReduceAction574
 special ReduceAction
 end
 private class ReduceAction574
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20514,7 +20514,7 @@ init do end
 end
 private class ReduceAction575
 special ReduceAction
 end
 private class ReduceAction575
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -20556,7 +20556,7 @@ init do end
 end
 private class ReduceAction576
 special ReduceAction
 end
 private class ReduceAction576
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -20595,7 +20595,7 @@ init do end
 end
 private class ReduceAction577
 special ReduceAction
 end
 private class ReduceAction577
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -20631,7 +20631,7 @@ init do end
 end
 private class ReduceAction578
 special ReduceAction
 end
 private class ReduceAction578
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -20661,7 +20661,7 @@ init do end
 end
 private class ReduceAction579
 special ReduceAction
 end
 private class ReduceAction579
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20688,7 +20688,7 @@ init do end
 end
 private class ReduceAction580
 special ReduceAction
 end
 private class ReduceAction580
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -20730,7 +20730,7 @@ init do end
 end
 private class ReduceAction581
 special ReduceAction
 end
 private class ReduceAction581
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -20769,7 +20769,7 @@ init do end
 end
 private class ReduceAction582
 special ReduceAction
 end
 private class ReduceAction582
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -20805,7 +20805,7 @@ init do end
 end
 private class ReduceAction583
 special ReduceAction
 end
 private class ReduceAction583
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20825,7 +20825,7 @@ init do end
 end
 private class ReduceAction584
 special ReduceAction
 end
 private class ReduceAction584
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist8 = p.pop

@@ -20857,7 +20857,7 @@ init do end
 end
 private class ReduceAction585
 special ReduceAction
 end
 private class ReduceAction585
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -20887,7 +20887,7 @@ init do end
 end
 private class ReduceAction586
 special ReduceAction
 end
 private class ReduceAction586
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -20924,7 +20924,7 @@ init do end
 end
 private class ReduceAction587
 special ReduceAction
 end
 private class ReduceAction587
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -20945,7 +20945,7 @@ init do end
 end
 private class ReduceAction588
 special ReduceAction
 end
 private class ReduceAction588
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -20969,7 +20969,7 @@ init do end
 end
 private class ReduceAction589
 special ReduceAction
 end
 private class ReduceAction589
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -20982,7 +20982,7 @@ init do end
 end
 private class ReduceAction590
 special ReduceAction
 end
 private class ReduceAction590
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -21028,7 +21028,7 @@ init do end
 end
 private class ReduceAction591
 special ReduceAction
 end
 private class ReduceAction591
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21071,7 +21071,7 @@ init do end
 end
 private class ReduceAction592
 special ReduceAction
 end
 private class ReduceAction592
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21111,7 +21111,7 @@ init do end
 end
 private class ReduceAction593
 special ReduceAction
 end
 private class ReduceAction593
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21124,7 +21124,7 @@ init do end
 end
 private class ReduceAction594
 special ReduceAction
 end
 private class ReduceAction594
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -21170,7 +21170,7 @@ init do end
 end
 private class ReduceAction595
 special ReduceAction
 end
 private class ReduceAction595
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21213,7 +21213,7 @@ init do end
 end
 private class ReduceAction596
 special ReduceAction
 end
 private class ReduceAction596
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21226,7 +21226,7 @@ init do end
 end
 private class ReduceAction597
 special ReduceAction
 end
 private class ReduceAction597
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -21272,7 +21272,7 @@ init do end
 end
 private class ReduceAction598
 special ReduceAction
 end
 private class ReduceAction598
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21315,7 +21315,7 @@ init do end
 end
 private class ReduceAction599
 special ReduceAction
 end
 private class ReduceAction599
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21328,7 +21328,7 @@ init do end
 end
 private class ReduceAction600
 special ReduceAction
 end
 private class ReduceAction600
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -21369,7 +21369,7 @@ init do end
 end
 private class ReduceAction601
 special ReduceAction
 end
 private class ReduceAction601
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21382,7 +21382,7 @@ init do end
 end
 private class ReduceAction602
 special ReduceAction
 end
 private class ReduceAction602
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21404,7 +21404,7 @@ init do end
 end
 private class ReduceAction603
 special ReduceAction
 end
 private class ReduceAction603
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21426,7 +21426,7 @@ init do end
 end
 private class ReduceAction604
 special ReduceAction
 end
 private class ReduceAction604
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21439,7 +21439,7 @@ init do end
 end
 private class ReduceAction605
 special ReduceAction
 end
 private class ReduceAction605
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21460,7 +21460,7 @@ init do end
 end
 private class ReduceAction606
 special ReduceAction
 end
 private class ReduceAction606
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21473,7 +21473,7 @@ init do end
 end
 private class ReduceAction607
 special ReduceAction
 end
 private class ReduceAction607
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21495,7 +21495,7 @@ init do end
 end
 private class ReduceAction608
 special ReduceAction
 end
 private class ReduceAction608
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21517,7 +21517,7 @@ init do end
 end
 private class ReduceAction609
 special ReduceAction
 end
 private class ReduceAction609
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21539,7 +21539,7 @@ init do end
 end
 private class ReduceAction610
 special ReduceAction
 end
 private class ReduceAction610
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21561,7 +21561,7 @@ init do end
 end
 private class ReduceAction611
 special ReduceAction
 end
 private class ReduceAction611
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21583,7 +21583,7 @@ init do end
 end
 private class ReduceAction612
 special ReduceAction
 end
 private class ReduceAction612
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21605,7 +21605,7 @@ init do end
 end
 private class ReduceAction613
 special ReduceAction
 end
 private class ReduceAction613
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21627,7 +21627,7 @@ init do end
 end
 private class ReduceAction614
 special ReduceAction
 end
 private class ReduceAction614
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21649,7 +21649,7 @@ init do end
 end
 private class ReduceAction615
 special ReduceAction
 end
 private class ReduceAction615
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21671,7 +21671,7 @@ init do end
 end
 private class ReduceAction616
 special ReduceAction
 end
 private class ReduceAction616
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21684,7 +21684,7 @@ init do end
 end
 private class ReduceAction617
 special ReduceAction
 end
 private class ReduceAction617
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21706,7 +21706,7 @@ init do end
 end
 private class ReduceAction618
 special ReduceAction
 end
 private class ReduceAction618
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21728,7 +21728,7 @@ init do end
 end
 private class ReduceAction619
 special ReduceAction
 end
 private class ReduceAction619
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21741,7 +21741,7 @@ init do end
 end
 private class ReduceAction620
 special ReduceAction
 end
 private class ReduceAction620
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21763,7 +21763,7 @@ init do end
 end
 private class ReduceAction621
 special ReduceAction
 end
 private class ReduceAction621
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21785,7 +21785,7 @@ init do end
 end
 private class ReduceAction622
 special ReduceAction
 end
 private class ReduceAction622
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21807,7 +21807,7 @@ init do end
 end
 private class ReduceAction623
 special ReduceAction
 end
 private class ReduceAction623
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21820,7 +21820,7 @@ init do end
 end
 private class ReduceAction624
 special ReduceAction
 end
 private class ReduceAction624
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21841,7 +21841,7 @@ init do end
 end
 private class ReduceAction625
 special ReduceAction
 end
 private class ReduceAction625
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -21862,7 +21862,7 @@ init do end
 end
 private class ReduceAction626
 special ReduceAction
 end
 private class ReduceAction626
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21875,7 +21875,7 @@ init do end
 end
 private class ReduceAction627
 special ReduceAction
 end
 private class ReduceAction627
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21909,7 +21909,7 @@ init do end
 end
 private class ReduceAction628
 special ReduceAction
 end
 private class ReduceAction628
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -21935,7 +21935,7 @@ init do end
 end
 private class ReduceAction629
 special ReduceAction
 end
 private class ReduceAction629
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -21958,7 +21958,7 @@ init do end
 end
 private class ReduceAction630
 special ReduceAction
 end
 private class ReduceAction630
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -21980,7 +21980,7 @@ init do end
 end
 private class ReduceAction631
 special ReduceAction
 end
 private class ReduceAction631
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -21999,7 +21999,7 @@ init do end
 end
 private class ReduceAction632
 special ReduceAction
 end
 private class ReduceAction632
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -22035,7 +22035,7 @@ init do end
 end
 private class ReduceAction633
 special ReduceAction
 end
 private class ReduceAction633
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -22068,7 +22068,7 @@ init do end
 end
 private class ReduceAction634
 special ReduceAction
 end
 private class ReduceAction634
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -22097,7 +22097,7 @@ init do end
 end
 private class ReduceAction635
 special ReduceAction
 end
 private class ReduceAction635
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -22129,7 +22129,7 @@ init do end
 end
 private class ReduceAction636
 special ReduceAction
 end
 private class ReduceAction636
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist5 = p.pop

@@ -22163,7 +22163,7 @@ init do end
 end
 private class ReduceAction637
 special ReduceAction
 end
 private class ReduceAction637
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -22194,7 +22194,7 @@ init do end
 end
 private class ReduceAction638
 special ReduceAction
 end
 private class ReduceAction638
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -22233,7 +22233,7 @@ init do end
 end
 private class ReduceAction639
 special ReduceAction
 end
 private class ReduceAction639
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22249,7 +22249,7 @@ init do end
 end
 private class ReduceAction640
 special ReduceAction
 end
 private class ReduceAction640
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22265,7 +22265,7 @@ init do end
 end
 private class ReduceAction641
 special ReduceAction
 end
 private class ReduceAction641
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22281,7 +22281,7 @@ init do end
 end
 private class ReduceAction642
 special ReduceAction
 end
 private class ReduceAction642
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22297,7 +22297,7 @@ init do end
 end
 private class ReduceAction643
 special ReduceAction
 end
 private class ReduceAction643
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22313,7 +22313,7 @@ init do end
 end
 private class ReduceAction644
 special ReduceAction
 end
 private class ReduceAction644
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22329,7 +22329,7 @@ init do end
 end
 private class ReduceAction645
 special ReduceAction
 end
 private class ReduceAction645
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22345,7 +22345,7 @@ init do end
 end
 private class ReduceAction646
 special ReduceAction
 end
 private class ReduceAction646
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22361,7 +22361,7 @@ init do end
 end
 private class ReduceAction647
 special ReduceAction
 end
 private class ReduceAction647
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22374,7 +22374,7 @@ init do end
 end
 private class ReduceAction648
 special ReduceAction
 end
 private class ReduceAction648
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -22405,7 +22405,7 @@ init do end
 end
 private class ReduceAction649
 special ReduceAction
 end
 private class ReduceAction649
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -22441,7 +22441,7 @@ init do end
 end
 private class ReduceAction650
 special ReduceAction
 end
 private class ReduceAction650
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22454,7 +22454,7 @@ init do end
 end
 private class ReduceAction651
 special ReduceAction
 end
 private class ReduceAction651
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -22500,7 +22500,7 @@ init do end
 end
 private class ReduceAction652
 special ReduceAction
 end
 private class ReduceAction652
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -22543,7 +22543,7 @@ init do end
 end
 private class ReduceAction653
 special ReduceAction
 end
 private class ReduceAction653
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22556,7 +22556,7 @@ init do end
 end
 private class ReduceAction654
 special ReduceAction
 end
 private class ReduceAction654
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop

@@ -22597,7 +22597,7 @@ init do end
 end
 private class ReduceAction655
 special ReduceAction
 end
 private class ReduceAction655
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22610,7 +22610,7 @@ init do end
 end
 private class ReduceAction656
 special ReduceAction
 end
 private class ReduceAction656
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22632,7 +22632,7 @@ init do end
 end
 private class ReduceAction657
 special ReduceAction
 end
 private class ReduceAction657
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22654,7 +22654,7 @@ init do end
 end
 private class ReduceAction658
 special ReduceAction
 end
 private class ReduceAction658
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22667,7 +22667,7 @@ init do end
 end
 private class ReduceAction659
 special ReduceAction
 end
 private class ReduceAction659
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -22688,7 +22688,7 @@ init do end
 end
 private class ReduceAction660
 special ReduceAction
 end
 private class ReduceAction660
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22701,7 +22701,7 @@ init do end
 end
 private class ReduceAction661
 special ReduceAction
 end
 private class ReduceAction661
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22723,7 +22723,7 @@ init do end
 end
 private class ReduceAction662
 special ReduceAction
 end
 private class ReduceAction662
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22745,7 +22745,7 @@ init do end
 end
 private class ReduceAction663
 special ReduceAction
 end
 private class ReduceAction663
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22767,7 +22767,7 @@ init do end
 end
 private class ReduceAction664
 special ReduceAction
 end
 private class ReduceAction664
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22789,7 +22789,7 @@ init do end
 end
 private class ReduceAction665
 special ReduceAction
 end
 private class ReduceAction665
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22811,7 +22811,7 @@ init do end
 end
 private class ReduceAction666
 special ReduceAction
 end
 private class ReduceAction666
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22833,7 +22833,7 @@ init do end
 end
 private class ReduceAction667
 special ReduceAction
 end
 private class ReduceAction667
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22855,7 +22855,7 @@ init do end
 end
 private class ReduceAction668
 special ReduceAction
 end
 private class ReduceAction668
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22877,7 +22877,7 @@ init do end
 end
 private class ReduceAction669
 special ReduceAction
 end
 private class ReduceAction669
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22899,7 +22899,7 @@ init do end
 end
 private class ReduceAction670
 special ReduceAction
 end
 private class ReduceAction670
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22912,7 +22912,7 @@ init do end
 end
 private class ReduceAction671
 special ReduceAction
 end
 private class ReduceAction671
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22934,7 +22934,7 @@ init do end
 end
 private class ReduceAction672
 special ReduceAction
 end
 private class ReduceAction672
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22956,7 +22956,7 @@ init do end
 end
 private class ReduceAction673
 special ReduceAction
 end
 private class ReduceAction673
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -22969,7 +22969,7 @@ init do end
 end
 private class ReduceAction674
 special ReduceAction
 end
 private class ReduceAction674
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -22991,7 +22991,7 @@ init do end
 end
 private class ReduceAction675
 special ReduceAction
 end
 private class ReduceAction675
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -23013,7 +23013,7 @@ init do end
 end
 private class ReduceAction676
 special ReduceAction
 end
 private class ReduceAction676
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -23035,7 +23035,7 @@ init do end
 end
 private class ReduceAction677
 special ReduceAction
 end
 private class ReduceAction677
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23048,7 +23048,7 @@ init do end
 end
 private class ReduceAction678
 special ReduceAction
 end
 private class ReduceAction678
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23069,7 +23069,7 @@ init do end
 end
 private class ReduceAction679
 special ReduceAction
 end
 private class ReduceAction679
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23090,7 +23090,7 @@ init do end
 end
 private class ReduceAction680
 special ReduceAction
 end
 private class ReduceAction680
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23103,7 +23103,7 @@ init do end
 end
 private class ReduceAction681
 special ReduceAction
 end
 private class ReduceAction681
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist4 = p.pop

@@ -23137,7 +23137,7 @@ init do end
 end
 private class ReduceAction682
 special ReduceAction
 end
 private class ReduceAction682
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23161,7 +23161,7 @@ init do end
 end
 private class ReduceAction683
 special ReduceAction
 end
 private class ReduceAction683
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23181,7 +23181,7 @@ init do end
 end
 private class ReduceAction684
 special ReduceAction
 end
 private class ReduceAction684
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23215,7 +23215,7 @@ init do end
 end
 private class ReduceAction685
 special ReduceAction
 end
 private class ReduceAction685
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23244,7 +23244,7 @@ init do end
 end
 private class ReduceAction686
 special ReduceAction
 end
 private class ReduceAction686
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23276,7 +23276,7 @@ init do end
 end
 private class ReduceAction687
 special ReduceAction
 end
 private class ReduceAction687
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23308,7 +23308,7 @@ init do end
 end
 private class ReduceAction688
 special ReduceAction
 end
 private class ReduceAction688
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist7 = p.pop

@@ -23347,7 +23347,7 @@ init do end
 end
 private class ReduceAction689
 special ReduceAction
 end
 private class ReduceAction689
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23363,7 +23363,7 @@ init do end
 end
 private class ReduceAction690
 special ReduceAction
 end
 private class ReduceAction690
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23379,7 +23379,7 @@ init do end
 end
 private class ReduceAction691
 special ReduceAction
 end
 private class ReduceAction691
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23395,7 +23395,7 @@ init do end
 end
 private class ReduceAction692
 special ReduceAction
 end
 private class ReduceAction692
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23411,7 +23411,7 @@ init do end
 end
 private class ReduceAction693
 special ReduceAction
 end
 private class ReduceAction693
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23427,7 +23427,7 @@ init do end
 end
 private class ReduceAction694
 special ReduceAction
 end
 private class ReduceAction694
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23443,7 +23443,7 @@ init do end
 end
 private class ReduceAction695
 special ReduceAction
 end
 private class ReduceAction695
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23459,7 +23459,7 @@ init do end
 end
 private class ReduceAction696
 special ReduceAction
 end
 private class ReduceAction696
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23475,7 +23475,7 @@ init do end
 end
 private class ReduceAction697
 special ReduceAction
 end
 private class ReduceAction697
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23488,7 +23488,7 @@ init do end
 end
 private class ReduceAction698
 special ReduceAction
 end
 private class ReduceAction698
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist10 = p.pop

@@ -23519,7 +23519,7 @@ init do end
 end
 private class ReduceAction699
 special ReduceAction
 end
 private class ReduceAction699
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist12 = p.pop

@@ -23555,7 +23555,7 @@ init do end
 end
 private class ReduceAction700
 special ReduceAction
 end
 private class ReduceAction700
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23570,7 +23570,7 @@ init do end
 end
 private class ReduceAction701
 special ReduceAction
 end
 private class ReduceAction701
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var pexprnode1: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
        do
                                        var node_list: nullable Object = null
                                        var pexprnode1: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(

@@ -23582,7 +23582,7 @@ init do end
 end
 private class ReduceAction702
 special ReduceAction
 end
 private class ReduceAction702
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23595,7 +23595,7 @@ init do end
 end
 private class ReduceAction703
 special ReduceAction
 end
 private class ReduceAction703
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -23641,7 +23641,7 @@ init do end
 end
 private class ReduceAction704
 special ReduceAction
 end
 private class ReduceAction704
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23684,7 +23684,7 @@ init do end
 end
 private class ReduceAction705
 special ReduceAction
 end
 private class ReduceAction705
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23697,7 +23697,7 @@ init do end
 end
 private class ReduceAction706
 special ReduceAction
 end
 private class ReduceAction706
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist6 = p.pop

@@ -23743,7 +23743,7 @@ init do end
 end
 private class ReduceAction707
 special ReduceAction
 end
 private class ReduceAction707
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist3 = p.pop

@@ -23786,7 +23786,7 @@ init do end
 end
 private class ReduceAction708
 special ReduceAction
 end
 private class ReduceAction708
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23803,7 +23803,7 @@ init do end
 end
 private class ReduceAction709
 special ReduceAction
 end
 private class ReduceAction709
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23830,7 +23830,7 @@ init do end
 end
 private class ReduceAction710
 special ReduceAction
 end
 private class ReduceAction710
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23847,7 +23847,7 @@ init do end
 end
 private class ReduceAction711
 special ReduceAction
 end
 private class ReduceAction711
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23874,7 +23874,7 @@ init do end
 end
 private class ReduceAction712
 special ReduceAction
 end
 private class ReduceAction712
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23891,7 +23891,7 @@ init do end
 end
 private class ReduceAction713
 special ReduceAction
 end
 private class ReduceAction713
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23918,7 +23918,7 @@ init do end
 end
 private class ReduceAction714
 special ReduceAction
 end
 private class ReduceAction714
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23935,7 +23935,7 @@ init do end
 end
 private class ReduceAction715
 special ReduceAction
 end
 private class ReduceAction715
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -23962,7 +23962,7 @@ init do end
 end
 private class ReduceAction716
 special ReduceAction
 end
 private class ReduceAction716
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -23979,7 +23979,7 @@ init do end
 end
 private class ReduceAction717
 special ReduceAction
 end
 private class ReduceAction717
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24006,7 +24006,7 @@ init do end
 end
 private class ReduceAction718
 special ReduceAction
 end
 private class ReduceAction718
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24023,7 +24023,7 @@ init do end
 end
 private class ReduceAction719
 special ReduceAction
 end
 private class ReduceAction719
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24050,7 +24050,7 @@ init do end
 end
 private class ReduceAction720
 special ReduceAction
 end
 private class ReduceAction720
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24067,7 +24067,7 @@ init do end
 end
 private class ReduceAction721
 special ReduceAction
 end
 private class ReduceAction721
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24094,7 +24094,7 @@ init do end
 end
 private class ReduceAction722
 special ReduceAction
 end
 private class ReduceAction722
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24111,7 +24111,7 @@ init do end
 end
 private class ReduceAction723
 special ReduceAction
 end
 private class ReduceAction723
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24138,7 +24138,7 @@ init do end
 end
 private class ReduceAction724
 special ReduceAction
 end
 private class ReduceAction724
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24155,7 +24155,7 @@ init do end
 end
 private class ReduceAction725
 special ReduceAction
 end
 private class ReduceAction725
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24182,7 +24182,7 @@ init do end
 end
 private class ReduceAction726
 special ReduceAction
 end
 private class ReduceAction726
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24203,7 +24203,7 @@ init do end
 end
 private class ReduceAction727
 special ReduceAction
 end
 private class ReduceAction727
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24234,7 +24234,7 @@ init do end
 end
 private class ReduceAction728
 special ReduceAction
 end
 private class ReduceAction728
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24251,7 +24251,7 @@ init do end
 end
 private class ReduceAction729
 special ReduceAction
 end
 private class ReduceAction729
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24278,7 +24278,7 @@ init do end
 end
 private class ReduceAction730
 special ReduceAction
 end
 private class ReduceAction730
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24295,7 +24295,7 @@ init do end
 end
 private class ReduceAction731
 special ReduceAction
 end
 private class ReduceAction731
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24322,7 +24322,7 @@ init do end
 end
 private class ReduceAction732
 special ReduceAction
 end
 private class ReduceAction732
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24339,7 +24339,7 @@ init do end
 end
 private class ReduceAction733
 special ReduceAction
 end
 private class ReduceAction733
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24366,7 +24366,7 @@ init do end
 end
 private class ReduceAction734
 special ReduceAction
 end
 private class ReduceAction734
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24383,7 +24383,7 @@ init do end
 end
 private class ReduceAction735
 special ReduceAction
 end
 private class ReduceAction735
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

@@ -24410,7 +24410,7 @@ init do end
 end
 private class ReduceAction736
 special ReduceAction
 end
 private class ReduceAction736
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop

@@ -24427,7 +24427,7 @@ init do end
 end
 private class ReduceAction737
 special ReduceAction
 end
 private class ReduceAction737
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index 60b2fa9..95e93fa 100644 (file)
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -305,676 +305,676 @@ class PDoc special Prod end
 
 class AModule
 special PModule
 
 class AModule
 special PModule

-    readable writable attr _n_packagedecl: nullable PPackagedecl = null
-    readable writable attr _n_imports: List[PImport] = new List[PImport]
-    readable writable attr _n_classdefs: List[PClassdef] = new List[PClassdef]
+    readable writable var _n_packagedecl: nullable PPackagedecl = null
+    readable writable var _n_imports: List[PImport] = new List[PImport]
+    readable writable var _n_classdefs: List[PClassdef] = new List[PClassdef]

 end
 class APackagedecl
 special PPackagedecl
 end
 class APackagedecl
 special PPackagedecl

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwpackage: TKwpackage
-    readable writable attr _n_id: TId
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwpackage: TKwpackage
+    readable writable var _n_id: TId

 end
 class AImport
 special PImport
 end
 class AImport
 special PImport

-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwimport: TKwimport
-    readable writable attr _n_id: TId
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwimport: TKwimport
+    readable writable var _n_id: TId

 end
 class ANoImport
 special PImport
 end
 class ANoImport
 special PImport

-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwimport: TKwimport
-    readable writable attr _n_kwend: TKwend
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwimport: TKwimport
+    readable writable var _n_kwend: TKwend

 end
 class APublicVisibility
 special PVisibility
 end
 class APrivateVisibility
 special PVisibility
 end
 class APublicVisibility
 special PVisibility
 end
 class APrivateVisibility
 special PVisibility

-    readable writable attr _n_kwprivate: TKwprivate
+    readable writable var _n_kwprivate: TKwprivate

 end
 class AProtectedVisibility
 special PVisibility
 end
 class AProtectedVisibility
 special PVisibility

-    readable writable attr _n_kwprotected: TKwprotected
+    readable writable var _n_kwprotected: TKwprotected

 end
 class AIntrudeVisibility
 special PVisibility
 end
 class AIntrudeVisibility
 special PVisibility

-    readable writable attr _n_kwintrude: TKwintrude
+    readable writable var _n_kwintrude: TKwintrude

 end
 class AClassdef
 special PClassdef
 end
 class AClassdef
 special PClassdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_classkind: PClasskind
-    readable writable attr _n_id: nullable TClassid = null
-    readable writable attr _n_formaldefs: List[PFormaldef] = new List[PFormaldef]
-    readable writable attr _n_superclasses: List[PSuperclass] = new List[PSuperclass]
-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_classkind: PClasskind
+    readable writable var _n_id: nullable TClassid = null
+    readable writable var _n_formaldefs: List[PFormaldef] = new List[PFormaldef]
+    readable writable var _n_superclasses: List[PSuperclass] = new List[PSuperclass]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class ATopClassdef
 special PClassdef
 end
 class ATopClassdef
 special PClassdef

-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class AMainClassdef
 special PClassdef
 end
 class AMainClassdef
 special PClassdef

-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class AConcreteClasskind
 special PClasskind
 end
 class AConcreteClasskind
 special PClasskind

-    readable writable attr _n_kwclass: TKwclass
+    readable writable var _n_kwclass: TKwclass

 end
 class AAbstractClasskind
 special PClasskind
 end
 class AAbstractClasskind
 special PClasskind

-    readable writable attr _n_kwabstract: TKwabstract
-    readable writable attr _n_kwclass: TKwclass
+    readable writable var _n_kwabstract: TKwabstract
+    readable writable var _n_kwclass: TKwclass

 end
 class AInterfaceClasskind
 special PClasskind
 end
 class AInterfaceClasskind
 special PClasskind

-    readable writable attr _n_kwinterface: TKwinterface
+    readable writable var _n_kwinterface: TKwinterface

 end
 class AUniversalClasskind
 special PClasskind
 end
 class AUniversalClasskind
 special PClasskind

-    readable writable attr _n_kwuniversal: TKwuniversal
+    readable writable var _n_kwuniversal: TKwuniversal

 end
 class AFormaldef
 special PFormaldef
 end
 class AFormaldef
 special PFormaldef

-    readable writable attr _n_id: TClassid
-    readable writable attr _n_type: nullable PType = null
+    readable writable var _n_id: TClassid
+    readable writable var _n_type: nullable PType = null

 end
 class ASuperclass
 special PSuperclass
 end
 class ASuperclass
 special PSuperclass

-    readable writable attr _n_kwspecial: TKwspecial
-    readable writable attr _n_type: PType
+    readable writable var _n_kwspecial: TKwspecial
+    readable writable var _n_type: PType

 end
 class AAttrPropdef
 special PPropdef
 end
 class AAttrPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_readable: nullable PAble = null
-    readable writable attr _n_writable: nullable PAble = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwattr: nullable TKwattr = null
-    readable writable attr _n_kwvar: nullable TKwvar = null
-    readable writable attr _n_id: TAttrid
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_readable: nullable PAble = null
+    readable writable var _n_writable: nullable PAble = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwattr: nullable TKwattr = null
+    readable writable var _n_kwvar: nullable TKwvar = null
+    readable writable var _n_id: TAttrid
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AMethPropdef
 special PPropdef
 end
 class AMethPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_methid: PMethid
-    readable writable attr _n_signature: PSignature
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_methid: PMethid
+    readable writable var _n_signature: PSignature

 end
 class ADeferredMethPropdef
 special PPropdef
 end
 class ADeferredMethPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwmeth: TKwmeth
-    readable writable attr _n_methid: PMethid
-    readable writable attr _n_signature: PSignature
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwmeth: TKwmeth
+    readable writable var _n_methid: PMethid
+    readable writable var _n_signature: PSignature

 end
 class AInternMethPropdef
 special PPropdef
 end
 class AInternMethPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwmeth: TKwmeth
-    readable writable attr _n_methid: PMethid
-    readable writable attr _n_signature: PSignature
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwmeth: TKwmeth
+    readable writable var _n_methid: PMethid
+    readable writable var _n_signature: PSignature

 end
 class AExternMethPropdef
 special PPropdef
 end
 class AExternMethPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwmeth: TKwmeth
-    readable writable attr _n_methid: PMethid
-    readable writable attr _n_signature: PSignature
-    readable writable attr _n_extern: nullable TString = null
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwmeth: TKwmeth
+    readable writable var _n_methid: PMethid
+    readable writable var _n_signature: PSignature
+    readable writable var _n_extern: nullable TString = null

 end
 class AConcreteMethPropdef
 special PPropdef
 end
 class AConcreteMethPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwmeth: TKwmeth
-    readable writable attr _n_methid: PMethid
-    readable writable attr _n_signature: PSignature
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwmeth: TKwmeth
+    readable writable var _n_methid: PMethid
+    readable writable var _n_signature: PSignature
+    readable writable var _n_block: nullable PExpr = null

 end
 class AConcreteInitPropdef
 special PPropdef
 end
 class AConcreteInitPropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwinit: TKwinit
-    readable writable attr _n_methid: nullable PMethid = null
-    readable writable attr _n_signature: PSignature
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwinit: TKwinit
+    readable writable var _n_methid: nullable PMethid = null
+    readable writable var _n_signature: PSignature
+    readable writable var _n_block: nullable PExpr = null

 end
 class AMainMethPropdef
 special PPropdef
 end
 class AMainMethPropdef
 special PPropdef

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_block: nullable PExpr = null

 end
 class ATypePropdef
 special PPropdef
 end
 class ATypePropdef
 special PPropdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwtype: TKwtype
-    readable writable attr _n_id: TClassid
-    readable writable attr _n_type: PType
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwtype: TKwtype
+    readable writable var _n_id: TClassid
+    readable writable var _n_type: PType

 end
 class AReadAble
 special PAble
 end
 class AReadAble
 special PAble

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_kwreadable: TKwreadable
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_kwreadable: TKwreadable

 end
 class AWriteAble
 special PAble
 end
 class AWriteAble
 special PAble

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_kwwritable: TKwwritable
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_kwwritable: TKwwritable

 end
 class AIdMethid
 special PMethid
 end
 class AIdMethid
 special PMethid

-    readable writable attr _n_id: TId
+    readable writable var _n_id: TId

 end
 class APlusMethid
 special PMethid
 end
 class APlusMethid
 special PMethid

-    readable writable attr _n_plus: TPlus
+    readable writable var _n_plus: TPlus

 end
 class AMinusMethid
 special PMethid
 end
 class AMinusMethid
 special PMethid

-    readable writable attr _n_minus: TMinus
+    readable writable var _n_minus: TMinus

 end
 class AStarMethid
 special PMethid
 end
 class AStarMethid
 special PMethid

-    readable writable attr _n_star: TStar
+    readable writable var _n_star: TStar

 end
 class ASlashMethid
 special PMethid
 end
 class ASlashMethid
 special PMethid

-    readable writable attr _n_slash: TSlash
+    readable writable var _n_slash: TSlash

 end
 class APercentMethid
 special PMethid
 end
 class APercentMethid
 special PMethid

-    readable writable attr _n_percent: TPercent
+    readable writable var _n_percent: TPercent

 end
 class AEqMethid
 special PMethid
 end
 class AEqMethid
 special PMethid

-    readable writable attr _n_eq: TEq
+    readable writable var _n_eq: TEq

 end
 class ANeMethid
 special PMethid
 end
 class ANeMethid
 special PMethid

-    readable writable attr _n_ne: TNe
+    readable writable var _n_ne: TNe

 end
 class ALeMethid
 special PMethid
 end
 class ALeMethid
 special PMethid

-    readable writable attr _n_le: TLe
+    readable writable var _n_le: TLe

 end
 class AGeMethid
 special PMethid
 end
 class AGeMethid
 special PMethid

-    readable writable attr _n_ge: TGe
+    readable writable var _n_ge: TGe

 end
 class ALtMethid
 special PMethid
 end
 class ALtMethid
 special PMethid

-    readable writable attr _n_lt: TLt
+    readable writable var _n_lt: TLt

 end
 class AGtMethid
 special PMethid
 end
 class AGtMethid
 special PMethid

-    readable writable attr _n_gt: TGt
+    readable writable var _n_gt: TGt

 end
 class ABraMethid
 special PMethid
 end
 class ABraMethid
 special PMethid

-    readable writable attr _n_obra: TObra
-    readable writable attr _n_cbra: TCbra
+    readable writable var _n_obra: TObra
+    readable writable var _n_cbra: TCbra

 end
 class AStarshipMethid
 special PMethid
 end
 class AStarshipMethid
 special PMethid

-    readable writable attr _n_starship: TStarship
+    readable writable var _n_starship: TStarship

 end
 class AAssignMethid
 special PMethid
 end
 class AAssignMethid
 special PMethid

-    readable writable attr _n_id: TId
-    readable writable attr _n_assign: TAssign
+    readable writable var _n_id: TId
+    readable writable var _n_assign: TAssign

 end
 class ABraassignMethid
 special PMethid
 end
 class ABraassignMethid
 special PMethid

-    readable writable attr _n_obra: TObra
-    readable writable attr _n_cbra: TCbra
-    readable writable attr _n_assign: TAssign
+    readable writable var _n_obra: TObra
+    readable writable var _n_cbra: TCbra
+    readable writable var _n_assign: TAssign

 end
 class ASignature
 special PSignature
 end
 class ASignature
 special PSignature

-    readable writable attr _n_params: List[PParam] = new List[PParam]
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_closure_decls: List[PClosureDecl] = new List[PClosureDecl]
+    readable writable var _n_params: List[PParam] = new List[PParam]
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_closure_decls: List[PClosureDecl] = new List[PClosureDecl]

 end
 class AParam
 special PParam
 end
 class AParam
 special PParam

-    readable writable attr _n_id: TId
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_dotdotdot: nullable TDotdotdot = null
+    readable writable var _n_id: TId
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_dotdotdot: nullable TDotdotdot = null

 end
 class AClosureDecl
 special PClosureDecl
 end
 class AClosureDecl
 special PClosureDecl

-    readable writable attr _n_kwwith: TKwwith
-    readable writable attr _n_kwbreak: nullable TKwbreak = null
-    readable writable attr _n_id: TId
-    readable writable attr _n_signature: PSignature
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwwith: TKwwith
+    readable writable var _n_kwbreak: nullable TKwbreak = null
+    readable writable var _n_id: TId
+    readable writable var _n_signature: PSignature
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AType
 special PType
 end
 class AType
 special PType

-    readable writable attr _n_kwnullable: nullable TKwnullable = null
-    readable writable attr _n_id: TClassid
-    readable writable attr _n_types: List[PType] = new List[PType]
+    readable writable var _n_kwnullable: nullable TKwnullable = null
+    readable writable var _n_id: TClassid
+    readable writable var _n_types: List[PType] = new List[PType]

 end
 class ABlockExpr
 special PExpr
 end
 class ABlockExpr
 special PExpr

-    readable writable attr _n_expr: List[PExpr] = new List[PExpr]
+    readable writable var _n_expr: List[PExpr] = new List[PExpr]

 end
 class AVardeclExpr
 special PExpr
 end
 class AVardeclExpr
 special PExpr

-    readable writable attr _n_kwvar: TKwvar
-    readable writable attr _n_id: TId
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_assign: nullable TAssign = null
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwvar: TKwvar
+    readable writable var _n_id: TId
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_assign: nullable TAssign = null
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AReturnExpr
 special PExpr
 end
 class AReturnExpr
 special PExpr

-    readable writable attr _n_kwreturn: TKwreturn
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwreturn: TKwreturn
+    readable writable var _n_expr: nullable PExpr = null

 end
 class ABreakExpr
 special PExpr
 end
 class ABreakExpr
 special PExpr

-    readable writable attr _n_kwbreak: TKwbreak
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwbreak: TKwbreak
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AAbortExpr
 special PExpr
 end
 class AAbortExpr
 special PExpr

-    readable writable attr _n_kwabort: TKwabort
+    readable writable var _n_kwabort: TKwabort

 end
 class AContinueExpr
 special PExpr
 end
 class AContinueExpr
 special PExpr

-    readable writable attr _n_kwcontinue: TKwcontinue
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwcontinue: TKwcontinue
+    readable writable var _n_expr: nullable PExpr = null

 end
 class ADoExpr
 special PExpr
 end
 class ADoExpr
 special PExpr

-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AIfExpr
 special PExpr
 end
 class AIfExpr
 special PExpr

-    readable writable attr _n_kwif: TKwif
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_then: nullable PExpr = null
-    readable writable attr _n_else: nullable PExpr = null
+    readable writable var _n_kwif: TKwif
+    readable writable var _n_expr: PExpr
+    readable writable var _n_then: nullable PExpr = null
+    readable writable var _n_else: nullable PExpr = null

 end
 class AIfexprExpr
 special PExpr
 end
 class AIfexprExpr
 special PExpr

-    readable writable attr _n_kwif: TKwif
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwthen: TKwthen
-    readable writable attr _n_then: PExpr
-    readable writable attr _n_kwelse: TKwelse
-    readable writable attr _n_else: PExpr
+    readable writable var _n_kwif: TKwif
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwthen: TKwthen
+    readable writable var _n_then: PExpr
+    readable writable var _n_kwelse: TKwelse
+    readable writable var _n_else: PExpr

 end
 class AWhileExpr
 special PExpr
 end
 class AWhileExpr
 special PExpr

-    readable writable attr _n_kwwhile: TKwwhile
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwwhile: TKwwhile
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AForExpr
 special PExpr
 end
 class AForExpr
 special PExpr

-    readable writable attr _n_kwfor: TKwfor
-    readable writable attr _n_id: TId
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwfor: TKwfor
+    readable writable var _n_id: TId
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AAssertExpr
 special PExpr
 end
 class AAssertExpr
 special PExpr

-    readable writable attr _n_kwassert: TKwassert
-    readable writable attr _n_id: nullable TId = null
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_kwassert: TKwassert
+    readable writable var _n_id: nullable TId = null
+    readable writable var _n_expr: PExpr

 end
 class AOnceExpr
 special PExpr
 end
 class AOnceExpr
 special PExpr

-    readable writable attr _n_kwonce: TKwonce
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_kwonce: TKwonce
+    readable writable var _n_expr: PExpr

 end
 class ASendExpr
 special PExpr
 end
 class ASendExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
+    readable writable var _n_expr: PExpr

 end
 class ABinopExpr
 special PExpr
 end
 class ABinopExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AOrExpr
 special PExpr
 end
 class AOrExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AAndExpr
 special PExpr
 end
 class AAndExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ANotExpr
 special PExpr
 end
 class ANotExpr
 special PExpr

-    readable writable attr _n_kwnot: TKwnot
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_kwnot: TKwnot
+    readable writable var _n_expr: PExpr

 end
 class AEqExpr
 special PExpr
 end
 class AEqExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AEeExpr
 special PExpr
 end
 class AEeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ANeExpr
 special PExpr
 end
 class ANeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ALtExpr
 special PExpr
 end
 class ALtExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ALeExpr
 special PExpr
 end
 class ALeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AGtExpr
 special PExpr
 end
 class AGtExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AGeExpr
 special PExpr
 end
 class AGeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AIsaExpr
 special PExpr
 end
 class AIsaExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_type: PType
+    readable writable var _n_expr: PExpr
+    readable writable var _n_type: PType

 end
 class APlusExpr
 special PExpr
 end
 class APlusExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AMinusExpr
 special PExpr
 end
 class AMinusExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AStarshipExpr
 special PExpr
 end
 class AStarshipExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AStarExpr
 special PExpr
 end
 class AStarExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ASlashExpr
 special PExpr
 end
 class ASlashExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class APercentExpr
 special PExpr
 end
 class APercentExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AUminusExpr
 special PExpr
 end
 class AUminusExpr
 special PExpr

-    readable writable attr _n_minus: TMinus
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_minus: TMinus
+    readable writable var _n_expr: PExpr

 end
 class ANewExpr
 special PExpr
 end
 class ANewExpr
 special PExpr

-    readable writable attr _n_kwnew: TKwnew
-    readable writable attr _n_type: PType
-    readable writable attr _n_id: nullable TId = null
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_kwnew: TKwnew
+    readable writable var _n_type: PType
+    readable writable var _n_id: nullable TId = null
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class AAttrExpr
 special PExpr
 end
 class AAttrExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TAttrid
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TAttrid

 end
 class AAttrAssignExpr
 special PExpr
 end
 class AAttrAssignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TAttrid
-    readable writable attr _n_assign: TAssign
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TAttrid
+    readable writable var _n_assign: TAssign
+    readable writable var _n_value: PExpr

 end
 class AAttrReassignExpr
 special PExpr
 end
 class AAttrReassignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TAttrid
-    readable writable attr _n_assign_op: PAssignOp
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TAttrid
+    readable writable var _n_assign_op: PAssignOp
+    readable writable var _n_value: PExpr

 end
 class ACallExpr
 special PExpr
 end
 class ACallExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_closure_defs: List[PClosureDef] = new List[PClosureDef]
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_closure_defs: List[PClosureDef] = new List[PClosureDef]

 end
 class ACallAssignExpr
 special PExpr
 end
 class ACallAssignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_assign: TAssign
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_assign: TAssign
+    readable writable var _n_value: PExpr

 end
 class ACallReassignExpr
 special PExpr
 end
 class ACallReassignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_assign_op: PAssignOp
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_assign_op: PAssignOp
+    readable writable var _n_value: PExpr

 end
 class ASuperExpr
 special PExpr
 end
 class ASuperExpr
 special PExpr

-    readable writable attr _n_qualified: nullable PQualified = null
-    readable writable attr _n_kwsuper: TKwsuper
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_qualified: nullable PQualified = null
+    readable writable var _n_kwsuper: TKwsuper
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class AInitExpr
 special PExpr
 end
 class AInitExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwinit: TKwinit
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwinit: TKwinit
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class ABraExpr
 special PExpr
 end
 class ABraExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_closure_defs: List[PClosureDef] = new List[PClosureDef]
+    readable writable var _n_expr: PExpr
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_closure_defs: List[PClosureDef] = new List[PClosureDef]

 end
 class ABraAssignExpr
 special PExpr
 end
 class ABraAssignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_assign: TAssign
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_assign: TAssign
+    readable writable var _n_value: PExpr

 end
 class ABraReassignExpr
 special PExpr
 end
 class ABraReassignExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_assign_op: PAssignOp
-    readable writable attr _n_value: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_assign_op: PAssignOp
+    readable writable var _n_value: PExpr

 end
 class AClosureCallExpr
 special PExpr
 end
 class AClosureCallExpr
 special PExpr

-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_closure_defs: List[PClosureDef] = new List[PClosureDef]
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_closure_defs: List[PClosureDef] = new List[PClosureDef]

 end
 class AVarExpr
 special PExpr
 end
 class AVarExpr
 special PExpr

-    readable writable attr _n_id: TId
+    readable writable var _n_id: TId

 end
 class AVarAssignExpr
 special PExpr
 end
 class AVarAssignExpr
 special PExpr

-    readable writable attr _n_id: TId
-    readable writable attr _n_assign: TAssign
-    readable writable attr _n_value: PExpr
+    readable writable var _n_id: TId
+    readable writable var _n_assign: TAssign
+    readable writable var _n_value: PExpr

 end
 class AVarReassignExpr
 special PExpr
 end
 class AVarReassignExpr
 special PExpr

-    readable writable attr _n_id: TId
-    readable writable attr _n_assign_op: PAssignOp
-    readable writable attr _n_value: PExpr
+    readable writable var _n_id: TId
+    readable writable var _n_assign_op: PAssignOp
+    readable writable var _n_value: PExpr

 end
 class ARangeExpr
 special PExpr
 end
 class ARangeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ACrangeExpr
 special PExpr
 end
 class ACrangeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AOrangeExpr
 special PExpr
 end
 class AOrangeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AArrayExpr
 special PExpr
 end
 class AArrayExpr
 special PExpr

-    readable writable attr _n_exprs: List[PExpr] = new List[PExpr]
+    readable writable var _n_exprs: List[PExpr] = new List[PExpr]

 end
 class ASelfExpr
 special PExpr
 end
 class ASelfExpr
 special PExpr

-    readable writable attr _n_kwself: TKwself
+    readable writable var _n_kwself: TKwself

 end
 class AImplicitSelfExpr
 special PExpr
 end
 class ATrueExpr
 special PExpr
 end
 class AImplicitSelfExpr
 special PExpr
 end
 class ATrueExpr
 special PExpr

-    readable writable attr _n_kwtrue: TKwtrue
+    readable writable var _n_kwtrue: TKwtrue

 end
 class AFalseExpr
 special PExpr
 end
 class AFalseExpr
 special PExpr

-    readable writable attr _n_kwfalse: TKwfalse
+    readable writable var _n_kwfalse: TKwfalse

 end
 class ANullExpr
 special PExpr
 end
 class ANullExpr
 special PExpr

-    readable writable attr _n_kwnull: TKwnull
+    readable writable var _n_kwnull: TKwnull

 end
 class AIntExpr
 special PExpr
 end
 class AIntExpr
 special PExpr

-    readable writable attr _n_number: TNumber
+    readable writable var _n_number: TNumber

 end
 class AFloatExpr
 special PExpr
 end
 class AFloatExpr
 special PExpr

-    readable writable attr _n_float: TFloat
+    readable writable var _n_float: TFloat

 end
 class ACharExpr
 special PExpr
 end
 class ACharExpr
 special PExpr

-    readable writable attr _n_char: TChar
+    readable writable var _n_char: TChar

 end
 class AStringExpr
 special PExpr
 end
 class AStringExpr
 special PExpr

-    readable writable attr _n_string: TString
+    readable writable var _n_string: TString

 end
 class AStartStringExpr
 special PExpr
 end
 class AStartStringExpr
 special PExpr

-    readable writable attr _n_string: TStartString
+    readable writable var _n_string: TStartString

 end
 class AMidStringExpr
 special PExpr
 end
 class AMidStringExpr
 special PExpr

-    readable writable attr _n_string: TMidString
+    readable writable var _n_string: TMidString

 end
 class AEndStringExpr
 special PExpr
 end
 class AEndStringExpr
 special PExpr

-    readable writable attr _n_string: TEndString
+    readable writable var _n_string: TEndString

 end
 class ASuperstringExpr
 special PExpr
 end
 class ASuperstringExpr
 special PExpr

-    readable writable attr _n_exprs: List[PExpr] = new List[PExpr]
+    readable writable var _n_exprs: List[PExpr] = new List[PExpr]

 end
 class AParExpr
 special PExpr
 end
 class AParExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
+    readable writable var _n_expr: PExpr

 end
 class AAsCastExpr
 special PExpr
 end
 class AAsCastExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwas: TKwas
-    readable writable attr _n_type: PType
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwas: TKwas
+    readable writable var _n_type: PType

 end
 class AAsNotnullExpr
 special PExpr
 end
 class AAsNotnullExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwas: TKwas
-    readable writable attr _n_kwnot: TKwnot
-    readable writable attr _n_kwnull: TKwnull
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwas: TKwas
+    readable writable var _n_kwnot: TKwnot
+    readable writable var _n_kwnull: TKwnull

 end
 class AIssetAttrExpr
 special PExpr
 end
 class AIssetAttrExpr
 special PExpr

-    readable writable attr _n_kwisset: TKwisset
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TAttrid
+    readable writable var _n_kwisset: TKwisset
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TAttrid

 end
 class APlusAssignOp
 special PAssignOp
 end
 class APlusAssignOp
 special PAssignOp

-    readable writable attr _n_pluseq: TPluseq
+    readable writable var _n_pluseq: TPluseq

 end
 class AMinusAssignOp
 special PAssignOp
 end
 class AMinusAssignOp
 special PAssignOp

-    readable writable attr _n_minuseq: TMinuseq
+    readable writable var _n_minuseq: TMinuseq

 end
 class AClosureDef
 special PClosureDef
 end
 class AClosureDef
 special PClosureDef

-    readable writable attr _n_kwwith: TKwwith
-    readable writable attr _n_id: List[TId] = new List[TId]
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwwith: TKwwith
+    readable writable var _n_id: List[TId] = new List[TId]
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AQualified
 special PQualified
 end
 class AQualified
 special PQualified

-    readable writable attr _n_id: List[TId] = new List[TId]
-    readable writable attr _n_classid: nullable TClassid = null
+    readable writable var _n_id: List[TId] = new List[TId]
+    readable writable var _n_classid: nullable TClassid = null

 end
 class ADoc
 special PDoc
 end
 class ADoc
 special PDoc

-    readable writable attr _n_comment: List[TComment] = new List[TComment]
+    readable writable var _n_comment: List[TComment] = new List[TComment]

 end
 
 class Start
 special Prod
 end
 
 class Start
 special Prod

-    readable writable attr _n_base: nullable PModule 
-    readable writable attr _n_eof: EOF 
+    readable writable var _n_base: nullable PModule 
+    readable writable var _n_eof: EOF 

 end
 end

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 376838c..5ddd64c 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -291,17 +291,17 @@ class PClasskind special Prod end
 class PFormaldef special Prod end
 class PSuperclass special Prod end
 class PPropdef special Prod 
 class PFormaldef special Prod end
 class PSuperclass special Prod end
 class PPropdef special Prod 

-    readable writable attr _n_doc: nullable PDoc = null
+    readable writable var _n_doc: nullable PDoc = null

 end
 class PAble special Prod
 end
 class PAble special Prod

-    readable writable attr _n_kwredef: nullable TKwredef = null
+    readable writable var _n_kwredef: nullable TKwredef = null

 end
 class PMethid special Prod end
 class PSignature special Prod end
 class PParam
 special Prod
 end
 class PMethid special Prod end
 class PSignature special Prod end
 class PParam
 special Prod

-    readable writable attr _n_id: TId
-    readable writable attr _n_type: nullable PType = null
+    readable writable var _n_id: TId
+    readable writable var _n_type: nullable PType = null

 end
 class PClosureDecl special Prod end
 class PType special Prod end
 end
 class PClosureDecl special Prod end
 class PType special Prod end

@@ -313,365 +313,365 @@ class PDoc special Prod end
 
 class AModule
 special PModule
 
 class AModule
 special PModule

-    readable writable attr _n_packagedecl: nullable PPackagedecl = null
-    readable writable attr _n_imports: List[PImport] = new List[PImport]
-    readable writable attr _n_classdefs: List[PClassdef] = new List[PClassdef]
+    readable writable var _n_packagedecl: nullable PPackagedecl = null
+    readable writable var _n_imports: List[PImport] = new List[PImport]
+    readable writable var _n_classdefs: List[PClassdef] = new List[PClassdef]

 end
 class APackagedecl
 special PPackagedecl
 end
 class APackagedecl
 special PPackagedecl

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwpackage: TKwpackage
-    readable writable attr _n_id: TId
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwpackage: TKwpackage
+    readable writable var _n_id: TId

 end
 class AImport
 special PImport
 end
 class AImport
 special PImport

-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwimport: TKwimport
-    readable writable attr _n_id: TId
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwimport: TKwimport
+    readable writable var _n_id: TId

 end
 class ANoImport
 special PImport
 end
 class ANoImport
 special PImport

-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwimport: TKwimport
-    readable writable attr _n_kwend: TKwend
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwimport: TKwimport
+    readable writable var _n_kwend: TKwend

 end
 class APublicVisibility
 special PVisibility
 end
 class APrivateVisibility
 special PVisibility
 end
 class APublicVisibility
 special PVisibility
 end
 class APrivateVisibility
 special PVisibility

-    readable writable attr _n_kwprivate: TKwprivate
+    readable writable var _n_kwprivate: TKwprivate

 end
 class AProtectedVisibility
 special PVisibility
 end
 class AProtectedVisibility
 special PVisibility

-    readable writable attr _n_kwprotected: TKwprotected
+    readable writable var _n_kwprotected: TKwprotected

 end
 class AIntrudeVisibility
 special PVisibility
 end
 class AIntrudeVisibility
 special PVisibility

-    readable writable attr _n_kwintrude: TKwintrude
+    readable writable var _n_kwintrude: TKwintrude

 end
 class AClassdef
 special PClassdef
 end
 class AClassdef
 special PClassdef

-    readable writable attr _n_doc: nullable PDoc = null
-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_classkind: PClasskind
-    readable writable attr _n_id: nullable TClassid = null
-    readable writable attr _n_formaldefs: List[PFormaldef] = new List[PFormaldef]
-    readable writable attr _n_superclasses: List[PSuperclass] = new List[PSuperclass]
-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_doc: nullable PDoc = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_classkind: PClasskind
+    readable writable var _n_id: nullable TClassid = null
+    readable writable var _n_formaldefs: List[PFormaldef] = new List[PFormaldef]
+    readable writable var _n_superclasses: List[PSuperclass] = new List[PSuperclass]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class ATopClassdef
 special PClassdef
 end
 class ATopClassdef
 special PClassdef

-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class AMainClassdef
 special PClassdef
 end
 class AMainClassdef
 special PClassdef

-    readable writable attr _n_propdefs: List[PPropdef] = new List[PPropdef]
+    readable writable var _n_propdefs: List[PPropdef] = new List[PPropdef]

 end
 class AConcreteClasskind
 special PClasskind
 end
 class AConcreteClasskind
 special PClasskind

-    readable writable attr _n_kwclass: TKwclass
+    readable writable var _n_kwclass: TKwclass

 end
 class AAbstractClasskind
 special PClasskind
 end
 class AAbstractClasskind
 special PClasskind

-    readable writable attr _n_kwabstract: TKwabstract
-    readable writable attr _n_kwclass: TKwclass
+    readable writable var _n_kwabstract: TKwabstract
+    readable writable var _n_kwclass: TKwclass

 end
 class AInterfaceClasskind
 special PClasskind
 end
 class AInterfaceClasskind
 special PClasskind

-    readable writable attr _n_kwinterface: TKwinterface
+    readable writable var _n_kwinterface: TKwinterface

 end
 class AUniversalClasskind
 special PClasskind
 end
 class AUniversalClasskind
 special PClasskind

-    readable writable attr _n_kwuniversal: TKwuniversal
+    readable writable var _n_kwuniversal: TKwuniversal

 end
 class AFormaldef
 special PFormaldef
 end
 class AFormaldef
 special PFormaldef

-    readable writable attr _n_id: TClassid
-    readable writable attr _n_type: nullable PType = null
+    readable writable var _n_id: TClassid
+    readable writable var _n_type: nullable PType = null

 end
 class ASuperclass
 special PSuperclass
 end
 class ASuperclass
 special PSuperclass

-    readable writable attr _n_kwspecial: TKwspecial
-    readable writable attr _n_type: PType
+    readable writable var _n_kwspecial: TKwspecial
+    readable writable var _n_type: PType

 end
 class AAttrPropdef
 special PPropdef
 end
 class AAttrPropdef
 special PPropdef

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwattr: nullable TKwattr = null
-    readable writable attr _n_kwvar: nullable TKwvar = null
-    readable writable attr _n_id: TAttrid
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_readable: nullable PAble = null
-    readable writable attr _n_writable: nullable PAble = null
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwattr: nullable TKwattr = null
+    readable writable var _n_kwvar: nullable TKwvar = null
+    readable writable var _n_id: TAttrid
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_readable: nullable PAble = null
+    readable writable var _n_writable: nullable PAble = null
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AMethPropdef
 special PPropdef
 end
 class AMethPropdef
 special PPropdef

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: nullable PVisibility
-    readable writable attr _n_methid: nullable PMethid = null
-    readable writable attr _n_signature: nullable PSignature
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: nullable PVisibility
+    readable writable var _n_methid: nullable PMethid = null
+    readable writable var _n_signature: nullable PSignature

 end
 class ADeferredMethPropdef
 special AMethPropdef
 end
 class ADeferredMethPropdef
 special AMethPropdef

-    readable writable attr _n_kwmeth: TKwmeth
+    readable writable var _n_kwmeth: TKwmeth

 end
 class AInternMethPropdef
 special AMethPropdef
 end
 class AInternMethPropdef
 special AMethPropdef

-    readable writable attr _n_kwmeth: TKwmeth
+    readable writable var _n_kwmeth: TKwmeth

 end
 class AExternMethPropdef
 special AMethPropdef
 end
 class AExternMethPropdef
 special AMethPropdef

-    readable writable attr _n_kwmeth: TKwmeth
-    readable writable attr _n_extern: nullable TString = null
+    readable writable var _n_kwmeth: TKwmeth
+    readable writable var _n_extern: nullable TString = null

 end
 class AConcreteMethPropdef
 special AMethPropdef
 end
 class AConcreteMethPropdef
 special AMethPropdef

-    readable writable attr _n_kwmeth: nullable TKwmeth
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwmeth: nullable TKwmeth
+    readable writable var _n_block: nullable PExpr = null

 end
 class AConcreteInitPropdef
 special AConcreteMethPropdef
 end
 class AConcreteInitPropdef
 special AConcreteMethPropdef

-    readable writable attr _n_kwinit: TKwinit
+    readable writable var _n_kwinit: TKwinit

 end
 class AMainMethPropdef
 special AConcreteMethPropdef
 end
 class ATypePropdef
 special PPropdef
 end
 class AMainMethPropdef
 special AConcreteMethPropdef
 end
 class ATypePropdef
 special PPropdef

-    readable writable attr _n_kwredef: nullable TKwredef = null
-    readable writable attr _n_visibility: PVisibility
-    readable writable attr _n_kwtype: TKwtype
-    readable writable attr _n_id: TClassid
-    readable writable attr _n_type: PType
+    readable writable var _n_kwredef: nullable TKwredef = null
+    readable writable var _n_visibility: PVisibility
+    readable writable var _n_kwtype: TKwtype
+    readable writable var _n_id: TClassid
+    readable writable var _n_type: PType

 end
 class AReadAble
 special PAble
 end
 class AReadAble
 special PAble

-    readable writable attr _n_kwreadable: TKwreadable
+    readable writable var _n_kwreadable: TKwreadable

 end
 class AWriteAble
 special PAble
 end
 class AWriteAble
 special PAble

-    readable writable attr _n_kwwritable: TKwwritable
+    readable writable var _n_kwwritable: TKwwritable

 end
 class AIdMethid
 special PMethid
 end
 class AIdMethid
 special PMethid

-    readable writable attr _n_id: TId
+    readable writable var _n_id: TId

 end
 class APlusMethid
 special PMethid
 end
 class APlusMethid
 special PMethid

-    readable writable attr _n_plus: TPlus
+    readable writable var _n_plus: TPlus

 end
 class AMinusMethid
 special PMethid
 end
 class AMinusMethid
 special PMethid

-    readable writable attr _n_minus: TMinus
+    readable writable var _n_minus: TMinus

 end
 class AStarMethid
 special PMethid
 end
 class AStarMethid
 special PMethid

-    readable writable attr _n_star: TStar
+    readable writable var _n_star: TStar

 end
 class ASlashMethid
 special PMethid
 end
 class ASlashMethid
 special PMethid

-    readable writable attr _n_slash: TSlash
+    readable writable var _n_slash: TSlash

 end
 class APercentMethid
 special PMethid
 end
 class APercentMethid
 special PMethid

-    readable writable attr _n_percent: TPercent
+    readable writable var _n_percent: TPercent

 end
 class AEqMethid
 special PMethid
 end
 class AEqMethid
 special PMethid

-    readable writable attr _n_eq: TEq
+    readable writable var _n_eq: TEq

 end
 class ANeMethid
 special PMethid
 end
 class ANeMethid
 special PMethid

-    readable writable attr _n_ne: TNe
+    readable writable var _n_ne: TNe

 end
 class ALeMethid
 special PMethid
 end
 class ALeMethid
 special PMethid

-    readable writable attr _n_le: TLe
+    readable writable var _n_le: TLe

 end
 class AGeMethid
 special PMethid
 end
 class AGeMethid
 special PMethid

-    readable writable attr _n_ge: TGe
+    readable writable var _n_ge: TGe

 end
 class ALtMethid
 special PMethid
 end
 class ALtMethid
 special PMethid

-    readable writable attr _n_lt: TLt
+    readable writable var _n_lt: TLt

 end
 class AGtMethid
 special PMethid
 end
 class AGtMethid
 special PMethid

-    readable writable attr _n_gt: TGt
+    readable writable var _n_gt: TGt

 end
 class ABraMethid
 special PMethid
 end
 class ABraMethid
 special PMethid

-    readable writable attr _n_obra: TObra
-    readable writable attr _n_cbra: TCbra
+    readable writable var _n_obra: TObra
+    readable writable var _n_cbra: TCbra

 end
 class AStarshipMethid
 special PMethid
 end
 class AStarshipMethid
 special PMethid

-    readable writable attr _n_starship: TStarship
+    readable writable var _n_starship: TStarship

 end
 class AAssignMethid
 special PMethid
 end
 class AAssignMethid
 special PMethid

-    readable writable attr _n_id: TId
-    readable writable attr _n_assign: TAssign
+    readable writable var _n_id: TId
+    readable writable var _n_assign: TAssign

 end
 class ABraassignMethid
 special PMethid
 end
 class ABraassignMethid
 special PMethid

-    readable writable attr _n_obra: TObra
-    readable writable attr _n_cbra: TCbra
-    readable writable attr _n_assign: TAssign
+    readable writable var _n_obra: TObra
+    readable writable var _n_cbra: TCbra
+    readable writable var _n_assign: TAssign

 end
 class ASignature
 special PSignature
 end
 class ASignature
 special PSignature

-    readable writable attr _n_params: List[PParam] = new List[PParam]
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_closure_decls: List[PClosureDecl] = new List[PClosureDecl]
+    readable writable var _n_params: List[PParam] = new List[PParam]
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_closure_decls: List[PClosureDecl] = new List[PClosureDecl]

 end
 class AParam
 special PParam
 end
 class AParam
 special PParam

-    readable writable attr _n_dotdotdot: nullable TDotdotdot = null
+    readable writable var _n_dotdotdot: nullable TDotdotdot = null

 end
 class AClosureDecl
 special PClosureDecl
 end
 class AClosureDecl
 special PClosureDecl

-    readable writable attr _n_kwwith: TKwwith
-    readable writable attr _n_kwbreak: nullable TKwbreak = null
-    readable writable attr _n_id: TId
-    readable writable attr _n_signature: PSignature
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwwith: TKwwith
+    readable writable var _n_kwbreak: nullable TKwbreak = null
+    readable writable var _n_id: TId
+    readable writable var _n_signature: PSignature
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AType
 special PType
 end
 class AType
 special PType

-    readable writable attr _n_kwnullable: nullable TKwnullable = null
-    readable writable attr _n_id: TClassid
-    readable writable attr _n_types: List[PType] = new List[PType]
+    readable writable var _n_kwnullable: nullable TKwnullable = null
+    readable writable var _n_id: TClassid
+    readable writable var _n_types: List[PType] = new List[PType]

 end
 
 
 
 class ABlockExpr
 special PExpr
 end
 
 
 
 class ABlockExpr
 special PExpr

-    readable writable attr _n_expr: List[PExpr] = new List[PExpr]
+    readable writable var _n_expr: List[PExpr] = new List[PExpr]

 end
 class AVardeclExpr
 special PExpr
 end
 class AVardeclExpr
 special PExpr

-    readable writable attr _n_kwvar: TKwvar
-    readable writable attr _n_id: TId
-    readable writable attr _n_type: nullable PType = null
-    readable writable attr _n_assign: nullable TAssign = null
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwvar: TKwvar
+    readable writable var _n_id: TId
+    readable writable var _n_type: nullable PType = null
+    readable writable var _n_assign: nullable TAssign = null
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AReturnExpr
 special PExpr
 end
 class AReturnExpr
 special PExpr

-    readable writable attr _n_kwreturn: TKwreturn
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwreturn: TKwreturn
+    readable writable var _n_expr: nullable PExpr = null

 end
 class ABreakExpr
 special PExpr
 end
 class ABreakExpr
 special PExpr

-    readable writable attr _n_kwbreak: TKwbreak
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwbreak: TKwbreak
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AAbortExpr
 special PExpr
 end
 class AAbortExpr
 special PExpr

-    readable writable attr _n_kwabort: TKwabort
+    readable writable var _n_kwabort: TKwabort

 end
 class AContinueExpr
 special PExpr
 end
 class AContinueExpr
 special PExpr

-    readable writable attr _n_kwcontinue: TKwcontinue
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwcontinue: TKwcontinue
+    readable writable var _n_expr: nullable PExpr = null

 end
 class ADoExpr
 special PExpr
 end
 class ADoExpr
 special PExpr

-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AIfExpr
 special PExpr
 end
 class AIfExpr
 special PExpr

-    readable writable attr _n_kwif: TKwif
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_then: nullable PExpr = null
-    readable writable attr _n_else: nullable PExpr = null
+    readable writable var _n_kwif: TKwif
+    readable writable var _n_expr: PExpr
+    readable writable var _n_then: nullable PExpr = null
+    readable writable var _n_else: nullable PExpr = null

 end
 class AIfexprExpr
 special PExpr
 end
 class AIfexprExpr
 special PExpr

-    readable writable attr _n_kwif: TKwif
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwthen: TKwthen
-    readable writable attr _n_then: PExpr
-    readable writable attr _n_kwelse: TKwelse
-    readable writable attr _n_else: PExpr
+    readable writable var _n_kwif: TKwif
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwthen: TKwthen
+    readable writable var _n_then: PExpr
+    readable writable var _n_kwelse: TKwelse
+    readable writable var _n_else: PExpr

 end
 class AWhileExpr
 special PExpr
 end
 class AWhileExpr
 special PExpr

-    readable writable attr _n_kwwhile:  TKwwhile
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwwhile:  TKwwhile
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AForExpr
 special PExpr
 end
 class AForExpr
 special PExpr

-    readable writable attr _n_kwfor: TKwfor
-    readable writable attr _n_id: TId
-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_block: nullable PExpr = null
+    readable writable var _n_kwfor: TKwfor
+    readable writable var _n_id: TId
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_block: nullable PExpr = null

 end
 class AAssertExpr
 special PExpr
 end
 class AAssertExpr
 special PExpr

-    readable writable attr _n_kwassert: TKwassert
-    readable writable attr _n_id: nullable TId = null
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_kwassert: TKwassert
+    readable writable var _n_id: nullable TId = null
+    readable writable var _n_expr: PExpr

 end
 class AAssignFormExpr
 special PExpr
 end
 class AAssignFormExpr
 special PExpr

-    readable writable attr _n_assign: TAssign
-    readable writable attr _n_value: PExpr
+    readable writable var _n_assign: TAssign
+    readable writable var _n_value: PExpr

 end
 class AReassignFormExpr
 special PExpr
 end
 class AReassignFormExpr
 special PExpr

-    readable writable attr _n_assign_op: PAssignOp
-    readable writable attr _n_value: PExpr
+    readable writable var _n_assign_op: PAssignOp
+    readable writable var _n_value: PExpr

 end
 class AOnceExpr
 special AProxyExpr
 end
 class AOnceExpr
 special AProxyExpr

-    readable writable attr _n_kwonce: TKwonce
+    readable writable var _n_kwonce: TKwonce

 end
 class ASendExpr
 special PExpr
 end
 class ASendExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_closure_defs: List[PClosureDef] = new List[PClosureDef]
+    readable writable var _n_expr: PExpr
+    readable writable var _n_closure_defs: List[PClosureDef] = new List[PClosureDef]

 end
 class ABinopExpr
 special ASendExpr
 end
 class ABinopExpr
 special ASendExpr

-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ABoolExpr
 special PExpr
 end
 class AOrExpr
 special ABoolExpr
 end
 class ABoolExpr
 special PExpr
 end
 class AOrExpr
 special ABoolExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class AAndExpr
 special ABoolExpr
 end
 class AAndExpr
 special ABoolExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ANotExpr
 special ABoolExpr
 end
 class ANotExpr
 special ABoolExpr

-    readable writable attr _n_kwnot: TKwnot
-    readable writable attr _n_expr: PExpr
+    readable writable var _n_kwnot: TKwnot
+    readable writable var _n_expr: PExpr

 end
 class AEqExpr
 special ABinopExpr
 end
 class AEeExpr
 special ABoolExpr
 end
 class AEqExpr
 special ABinopExpr
 end
 class AEeExpr
 special ABoolExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ANeExpr
 special ABinopExpr
 end
 class ANeExpr
 special ABinopExpr

@@ -690,8 +690,8 @@ special ABinopExpr
 end
 class AIsaExpr
 special ABoolExpr
 end
 class AIsaExpr
 special ABoolExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_type: PType
+    readable writable var _n_expr: PExpr
+    readable writable var _n_type: PType

 end
 class APlusExpr
 special ABinopExpr
 end
 class APlusExpr
 special ABinopExpr

@@ -713,19 +713,19 @@ special ABinopExpr
 end
 class AUminusExpr
 special ASendExpr
 end
 class AUminusExpr
 special ASendExpr

-    readable writable attr _n_minus: TMinus
+    readable writable var _n_minus: TMinus

 end
 class ANewExpr
 special PExpr
 end
 class ANewExpr
 special PExpr

-    readable writable attr _n_kwnew: TKwnew
-    readable writable attr _n_type: PType
-    readable writable attr _n_id: nullable TId = null
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_kwnew: TKwnew
+    readable writable var _n_type: PType
+    readable writable var _n_id: nullable TId = null
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class AAttrFormExpr
 special PExpr
 end
 class AAttrFormExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_id: TAttrid
+    readable writable var _n_expr: PExpr
+    readable writable var _n_id: TAttrid

 end
 class AAttrExpr
 special AAttrFormExpr
 end
 class AAttrExpr
 special AAttrFormExpr

@@ -736,8 +736,8 @@ special AAssignFormExpr
 end
 class ACallFormExpr
 special ASendExpr
 end
 class ACallFormExpr
 special ASendExpr

-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class AAttrReassignExpr
 special PExpr
 end
 class AAttrReassignExpr
 special PExpr

@@ -758,18 +758,18 @@ special AReassignFormExpr
 end
 class ASuperExpr
 special PExpr
 end
 class ASuperExpr
 special PExpr

-    readable writable attr _n_qualified: nullable PQualified = null
-    readable writable attr _n_kwsuper: TKwsuper
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_qualified: nullable PQualified = null
+    readable writable var _n_kwsuper: TKwsuper
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class AInitExpr
 special ASendExpr
 end
 class AInitExpr
 special ASendExpr

-    readable writable attr _n_kwinit: TKwinit
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_kwinit: TKwinit
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class ABraFormExpr
 special ASendExpr
 end
 class ABraFormExpr
 special ASendExpr

-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_args: List[PExpr] = new List[PExpr]

 end
 class ABraExpr
 special ABraFormExpr
 end
 class ABraExpr
 special ABraFormExpr

@@ -780,7 +780,7 @@ special AAssignFormExpr
 end
 class AVarFormExpr
 special PExpr
 end
 class AVarFormExpr
 special PExpr

-    readable writable attr _n_id: TId
+    readable writable var _n_id: TId

 end
 class ABraReassignExpr
 special ABraFormExpr
 end
 class ABraReassignExpr
 special ABraFormExpr

@@ -788,9 +788,9 @@ special AReassignFormExpr
 end
 class AClosureCallExpr
 special PExpr
 end
 class AClosureCallExpr
 special PExpr

-    readable writable attr _n_id: TId
-    readable writable attr _n_args: List[PExpr] = new List[PExpr]
-    readable writable attr _n_closure_defs: List[PClosureDef] = new List[PClosureDef]
+    readable writable var _n_id: TId
+    readable writable var _n_args: List[PExpr] = new List[PExpr]
+    readable writable var _n_closure_defs: List[PClosureDef] = new List[PClosureDef]

 end
 class AVarExpr
 special AVarFormExpr
 end
 class AVarExpr
 special AVarFormExpr

@@ -805,8 +805,8 @@ special AReassignFormExpr
 end
 class ARangeExpr
 special PExpr
 end
 class ARangeExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_expr2: PExpr
+    readable writable var _n_expr: PExpr
+    readable writable var _n_expr2: PExpr

 end
 class ACrangeExpr
 special ARangeExpr
 end
 class ACrangeExpr
 special ARangeExpr

@@ -816,113 +816,113 @@ special ARangeExpr
 end
 class AArrayExpr
 special PExpr
 end
 class AArrayExpr
 special PExpr

-    readable writable attr _n_exprs: List[PExpr] = new List[PExpr]
+    readable writable var _n_exprs: List[PExpr] = new List[PExpr]

 end
 class ASelfExpr
 special PExpr
 end
 class ASelfExpr
 special PExpr

-    readable writable attr _n_kwself: nullable TKwself
+    readable writable var _n_kwself: nullable TKwself

 end
 class AImplicitSelfExpr
 special ASelfExpr
 end
 class ATrueExpr
 special ABoolExpr
 end
 class AImplicitSelfExpr
 special ASelfExpr
 end
 class ATrueExpr
 special ABoolExpr

-    readable writable attr _n_kwtrue: TKwtrue
+    readable writable var _n_kwtrue: TKwtrue

 end
 class AFalseExpr
 special ABoolExpr
 end
 class AFalseExpr
 special ABoolExpr

-    readable writable attr _n_kwfalse: TKwfalse
+    readable writable var _n_kwfalse: TKwfalse

 end
 class ANullExpr
 special PExpr
 end
 class ANullExpr
 special PExpr

-    readable writable attr _n_kwnull: TKwnull
+    readable writable var _n_kwnull: TKwnull

 end
 class AIntExpr
 special PExpr
 end
 class AIntExpr
 special PExpr

-    readable writable attr _n_number: TNumber
+    readable writable var _n_number: TNumber

 end
 class AFloatExpr
 special PExpr
 end
 class AFloatExpr
 special PExpr

-    readable writable attr _n_float: TFloat
+    readable writable var _n_float: TFloat

 end
 class ACharExpr
 special PExpr
 end
 class ACharExpr
 special PExpr

-    readable writable attr _n_char: TChar
+    readable writable var _n_char: TChar

 end
 class AStringFormExpr
 special PExpr
 end
 class AStringExpr
 special AStringFormExpr
 end
 class AStringFormExpr
 special PExpr
 end
 class AStringExpr
 special AStringFormExpr

-    readable writable attr _n_string: TString
+    readable writable var _n_string: TString

 end
 class AStartStringExpr
 special AStringFormExpr
 end
 class AStartStringExpr
 special AStringFormExpr

-    readable writable attr _n_string: TStartString
+    readable writable var _n_string: TStartString

 end
 class AMidStringExpr
 special AStringFormExpr
 end
 class AMidStringExpr
 special AStringFormExpr

-    readable writable attr _n_string: TMidString
+    readable writable var _n_string: TMidString

 end
 class AEndStringExpr
 special AStringFormExpr
 end
 class AEndStringExpr
 special AStringFormExpr

-    readable writable attr _n_string: TEndString
+    readable writable var _n_string: TEndString

 end
 class ASuperstringExpr
 special PExpr
 end
 class ASuperstringExpr
 special PExpr

-    readable writable attr _n_exprs: List[PExpr] = new List[PExpr]
+    readable writable var _n_exprs: List[PExpr] = new List[PExpr]

 end
 class AParExpr
 special AProxyExpr
 end
 class AProxyExpr
 special PExpr
 end
 class AParExpr
 special AProxyExpr
 end
 class AProxyExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
+    readable writable var _n_expr: PExpr

 end
 class AAsCastExpr
 special PExpr
 end
 class AAsCastExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwas: TKwas
-    readable writable attr _n_type: PType
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwas: TKwas
+    readable writable var _n_type: PType

 end
 class AAsNotnullExpr
 special PExpr
 end
 class AAsNotnullExpr
 special PExpr

-    readable writable attr _n_expr: PExpr
-    readable writable attr _n_kwas: TKwas
-    readable writable attr _n_kwnot: TKwnot
-    readable writable attr _n_kwnull: TKwnull
+    readable writable var _n_expr: PExpr
+    readable writable var _n_kwas: TKwas
+    readable writable var _n_kwnot: TKwnot
+    readable writable var _n_kwnull: TKwnull

 end
 class AIssetAttrExpr
 special AAttrFormExpr
 end
 class AIssetAttrExpr
 special AAttrFormExpr

-    readable writable attr _n_kwisset: TKwisset
+    readable writable var _n_kwisset: TKwisset

 end
 class APlusAssignOp
 special PAssignOp
 end
 class APlusAssignOp
 special PAssignOp

-    readable writable attr _n_pluseq: TPluseq
+    readable writable var _n_pluseq: TPluseq

 end
 class AMinusAssignOp
 special PAssignOp
 end
 class AMinusAssignOp
 special PAssignOp

-    readable writable attr _n_minuseq: TMinuseq
+    readable writable var _n_minuseq: TMinuseq

 end
 class AClosureDef
 special PClosureDef
 end
 class AClosureDef
 special PClosureDef

-    readable writable attr _n_kwwith: TKwwith
-    readable writable attr _n_id: List[TId] = new List[TId]
-    readable writable attr _n_kwdo: TKwdo
-    readable writable attr _n_expr: nullable PExpr = null
+    readable writable var _n_kwwith: TKwwith
+    readable writable var _n_id: List[TId] = new List[TId]
+    readable writable var _n_kwdo: TKwdo
+    readable writable var _n_expr: nullable PExpr = null

 end
 class AQualified
 special PQualified
 end
 class AQualified
 special PQualified

-    readable writable attr _n_id: List[TId] = new List[TId]
-    readable writable attr _n_classid: nullable TClassid = null
+    readable writable var _n_id: List[TId] = new List[TId]
+    readable writable var _n_classid: nullable TClassid = null

 end
 class ADoc
 special PDoc
 end
 class ADoc
 special PDoc

-    readable writable attr _n_comment: List[TComment] = new List[TComment]
+    readable writable var _n_comment: List[TComment] = new List[TComment]

 end
 
 class Start
 special Prod
 end
 
 class Start
 special Prod

-    readable writable attr _n_base: nullable PModule
-    readable writable attr _n_eof: EOF
+    readable writable var _n_base: nullable PModule
+    readable writable var _n_eof: EOF

 end
 end

diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit
index 13dd582..46c828b 100644 (file)
--- a/src/parser/parser_prod.nit
+++ b/src/parser/parser_prod.nit
@@ -7,19 +7,19 @@ intrude import parser_nodes
 
 redef class PNode
        # Parent of the node in the AST
 
 redef class PNode
        # Parent of the node in the AST

-       readable writable attr _parent: nullable PNode
+       readable writable var _parent: nullable PNode

 
        # Remove a child from the AST
 
        # Remove a child from the AST

-       meth remove_child(child: PNode)
+       fun remove_child(child: PNode)

        do
                replace_child(child, null)
        end
 
        # Replace a child with an other node in the AST
        do
                replace_child(child, null)
        end
 
        # Replace a child with an other node in the AST

-       meth replace_child(old_child: PNode, new_child: nullable PNode) is abstract
+       fun replace_child(old_child: PNode, new_child: nullable PNode) is abstract

 
        # Replace itself with an other node in the AST
 
        # Replace itself with an other node in the AST

-       meth replace_with(node: PNode)
+       fun replace_with(node: PNode)

        do
                if (_parent != null) then
                        _parent.replace_child(self, node)
        do
                if (_parent != null) then
                        _parent.replace_child(self, node)

@@ -28,46 +28,46 @@ redef class PNode
 
        # Visit all nodes in order.
        # Thus, call "v.visit(e)" for each node e
 
        # Visit all nodes in order.
        # Thus, call "v.visit(e)" for each node e

-       meth visit_all(v: Visitor) is abstract
+       fun visit_all(v: Visitor) is abstract

 
        # Visit all nodes in reverse order.
        # Thus, call "v.visit(e)" for each node e starting from the last child
 
        # Visit all nodes in reverse order.
        # Thus, call "v.visit(e)" for each node e starting from the last child

-       meth visit_all_reverse(v: Visitor) is abstract
+       fun visit_all_reverse(v: Visitor) is abstract

 
        # Give a human readable location of the node.
 
        # Give a human readable location of the node.

-       meth locate: String is abstract
+       fun locate: String is abstract

 
        # Return only the line number of the node
 
        # Return only the line number of the node

-       meth line_number: Int is abstract
+       fun line_number: Int is abstract

 
        # Debug method: output a message prefixed with the location.
 
        # Debug method: output a message prefixed with the location.

-       meth printl(str: String)
+       fun printl(str: String)

        do
                print("{locate}: {str}\n")
        end
 end
 
 redef class Token
        do
                print("{locate}: {str}\n")
        end
 end
 
 redef class Token

-       redef meth visit_all(v: Visitor) do end
-       redef meth visit_all_reverse(v: Visitor) do end
-       redef meth replace_child(old_child: PNode, new_child: nullable PNode) do end
+       redef fun visit_all(v: Visitor) do end
+       redef fun visit_all_reverse(v: Visitor) do end
+       redef fun replace_child(old_child: PNode, new_child: nullable PNode) do end

 
 

-       redef meth locate: String
+       redef fun locate: String

        do
                return "{filename}:{line},{pos}"
        end
 
        do
                return "{filename}:{line},{pos}"
        end
 

-       redef meth line_number do return line
+       redef fun line_number do return line

 end
 
 redef class Prod
        # The first token of the production node
 end
 
 redef class Prod
        # The first token of the production node

-       readable writable attr _first_token: nullable Token
+       readable writable var _first_token: nullable Token

 
        # The last token of the production node
 
        # The last token of the production node

-       readable writable attr _last_token: nullable Token
+       readable writable var _last_token: nullable Token

 
 

-       redef meth locate: String
+       redef fun locate: String

        do
                if first_token == null then
                        return "????"
        do
                if first_token == null then
                        return "????"

@@ -83,7 +83,7 @@ redef class Prod
                end
        end
 
                end
        end
 

-       redef meth replace_with(n: PNode)
+       redef fun replace_with(n: PNode)

         do
                 super
                 assert n isa Prod
         do
                 super
                 assert n isa Prod

@@ -91,7 +91,7 @@ redef class Prod
                 n.last_token = last_token
         end
 
                 n.last_token = last_token
         end
 

-       redef meth line_number
+       redef fun line_number

        do
                if first_token != null then
                        return first_token.line
        do
                if first_token != null then
                        return first_token.line

@@ -106,11 +106,11 @@ class Visitor
         # Ask the visitor to visit a given node.
         # Usually automatically called by visit_all* methods.
         # Concrete visitors should redefine this method.
         # Ask the visitor to visit a given node.
         # Usually automatically called by visit_all* methods.
         # Concrete visitors should redefine this method.

-        meth visit(e: nullable PNode) is abstract
+        fun visit(e: nullable PNode) is abstract

 end
 
 redef class AModule
 end
 
 redef class AModule

-    redef meth n_packagedecl=(n)
+    redef fun n_packagedecl=(n)

     do
         _n_packagedecl = n
         if n != null then
     do
         _n_packagedecl = n
         if n != null then

@@ -143,7 +143,7 @@ redef class AModule
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_packagedecl == old_child then
             if new_child != null then
     do
         if _n_packagedecl == old_child then
             if new_child != null then

@@ -181,7 +181,7 @@ redef class AModule
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_packagedecl != null then
             v.visit(_n_packagedecl.as(not null))
     do
         if _n_packagedecl != null then
             v.visit(_n_packagedecl.as(not null))

@@ -194,7 +194,7 @@ redef class AModule
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_packagedecl != null then
             v.visit(_n_packagedecl.as(not null))
     do
         if _n_packagedecl != null then
             v.visit(_n_packagedecl.as(not null))

@@ -216,19 +216,19 @@ redef class AModule
     end
 end
 redef class APackagedecl
     end
 end
 redef class APackagedecl

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwpackage=(n)
+    redef fun n_kwpackage=(n)

     do
         _n_kwpackage = n
        n.parent = self
     end
     do
         _n_kwpackage = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -253,7 +253,7 @@ redef class APackagedecl
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -287,7 +287,7 @@ redef class APackagedecl
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -296,7 +296,7 @@ redef class APackagedecl
         v.visit(_n_id)
     end
 
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -306,17 +306,17 @@ redef class APackagedecl
     end
 end
 redef class AImport
     end
 end
 redef class AImport

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwimport=(n)
+    redef fun n_kwimport=(n)

     do
         _n_kwimport = n
        n.parent = self
     end
     do
         _n_kwimport = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -339,7 +339,7 @@ redef class AImport
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_visibility == old_child then
             if new_child != null then
     do
         if _n_visibility == old_child then
             if new_child != null then

@@ -373,14 +373,14 @@ redef class AImport
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
         v.visit(_n_id)
     end
 
     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)

@@ -388,17 +388,17 @@ redef class AImport
     end
 end
 redef class ANoImport
     end
 end
 redef class ANoImport

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwimport=(n)
+    redef fun n_kwimport=(n)

     do
         _n_kwimport = n
        n.parent = self
     end
     do
         _n_kwimport = n
        n.parent = self
     end

-    redef meth n_kwend=(n)
+    redef fun n_kwend=(n)

     do
         _n_kwend = n
        n.parent = self
     do
         _n_kwend = n
        n.parent = self

@@ -421,7 +421,7 @@ redef class ANoImport
        n_kwend.parent = self
     end
 
        n_kwend.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_visibility == old_child then
             if new_child != null then
     do
         if _n_visibility == old_child then
             if new_child != null then

@@ -455,14 +455,14 @@ redef class ANoImport
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
         v.visit(_n_kwend)
     end
 
     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
         v.visit(_n_kwend)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)
     do
         v.visit(_n_visibility)
         v.visit(_n_kwimport)

@@ -478,20 +478,20 @@ redef class APublicVisibility
         empty_init
     end
 
         empty_init
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
     end
 
     do
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
     end
 
     do
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
     end
 end
 redef class APrivateVisibility
     do
     end
 end
 redef class APrivateVisibility

-    redef meth n_kwprivate=(n)
+    redef fun n_kwprivate=(n)

     do
         _n_kwprivate = n
        n.parent = self
     do
         _n_kwprivate = n
        n.parent = self

@@ -508,7 +508,7 @@ redef class APrivateVisibility
        n_kwprivate.parent = self
     end
 
        n_kwprivate.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwprivate == old_child then
             if new_child != null then
     do
         if _n_kwprivate == old_child then
             if new_child != null then

@@ -522,18 +522,18 @@ redef class APrivateVisibility
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwprivate)
     end
 
     do
         v.visit(_n_kwprivate)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwprivate)
     end
 end
 redef class AProtectedVisibility
     do
         v.visit(_n_kwprivate)
     end
 end
 redef class AProtectedVisibility

-    redef meth n_kwprotected=(n)
+    redef fun n_kwprotected=(n)

     do
         _n_kwprotected = n
        n.parent = self
     do
         _n_kwprotected = n
        n.parent = self

@@ -550,7 +550,7 @@ redef class AProtectedVisibility
        n_kwprotected.parent = self
     end
 
        n_kwprotected.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwprotected == old_child then
             if new_child != null then
     do
         if _n_kwprotected == old_child then
             if new_child != null then

@@ -564,18 +564,18 @@ redef class AProtectedVisibility
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwprotected)
     end
 
     do
         v.visit(_n_kwprotected)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwprotected)
     end
 end
 redef class AIntrudeVisibility
     do
         v.visit(_n_kwprotected)
     end
 end
 redef class AIntrudeVisibility

-    redef meth n_kwintrude=(n)
+    redef fun n_kwintrude=(n)

     do
         _n_kwintrude = n
        n.parent = self
     do
         _n_kwintrude = n
        n.parent = self

@@ -592,7 +592,7 @@ redef class AIntrudeVisibility
        n_kwintrude.parent = self
     end
 
        n_kwintrude.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwintrude == old_child then
             if new_child != null then
     do
         if _n_kwintrude == old_child then
             if new_child != null then

@@ -606,42 +606,42 @@ redef class AIntrudeVisibility
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwintrude)
     end
 
     do
         v.visit(_n_kwintrude)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwintrude)
     end
 end
 redef class AClassdef
     do
         v.visit(_n_kwintrude)
     end
 end
 redef class AClassdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_classkind=(n)
+    redef fun n_classkind=(n)

     do
         _n_classkind = n
        n.parent = self
     end
     do
         _n_classkind = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
         if n != null then
     do
         _n_id = n
         if n != null then

@@ -696,7 +696,7 @@ redef class AClassdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -786,7 +786,7 @@ redef class AClassdef
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -810,7 +810,7 @@ redef class AClassdef
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -862,7 +862,7 @@ redef class ATopClassdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_propdefs.length[ do
             if _n_propdefs[i] == old_child then
     do
         for i in [0.._n_propdefs.length[ do
             if _n_propdefs[i] == old_child then

@@ -878,14 +878,14 @@ redef class ATopClassdef
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_propdefs do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_propdefs do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_propdefs.length
     do
        do
            var i = _n_propdefs.length

@@ -912,7 +912,7 @@ redef class AMainClassdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_propdefs.length[ do
             if _n_propdefs[i] == old_child then
     do
         for i in [0.._n_propdefs.length[ do
             if _n_propdefs[i] == old_child then

@@ -928,14 +928,14 @@ redef class AMainClassdef
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_propdefs do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_propdefs do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_propdefs.length
     do
        do
            var i = _n_propdefs.length

@@ -947,7 +947,7 @@ redef class AMainClassdef
     end
 end
 redef class AConcreteClasskind
     end
 end
 redef class AConcreteClasskind

-    redef meth n_kwclass=(n)
+    redef fun n_kwclass=(n)

     do
         _n_kwclass = n
        n.parent = self
     do
         _n_kwclass = n
        n.parent = self

@@ -964,7 +964,7 @@ redef class AConcreteClasskind
        n_kwclass.parent = self
     end
 
        n_kwclass.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwclass == old_child then
             if new_child != null then
     do
         if _n_kwclass == old_child then
             if new_child != null then

@@ -978,23 +978,23 @@ redef class AConcreteClasskind
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwclass)
     end
 
     do
         v.visit(_n_kwclass)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwclass)
     end
 end
 redef class AAbstractClasskind
     do
         v.visit(_n_kwclass)
     end
 end
 redef class AAbstractClasskind

-    redef meth n_kwabstract=(n)
+    redef fun n_kwabstract=(n)

     do
         _n_kwabstract = n
        n.parent = self
     end
     do
         _n_kwabstract = n
        n.parent = self
     end

-    redef meth n_kwclass=(n)
+    redef fun n_kwclass=(n)

     do
         _n_kwclass = n
        n.parent = self
     do
         _n_kwclass = n
        n.parent = self

@@ -1014,7 +1014,7 @@ redef class AAbstractClasskind
        n_kwclass.parent = self
     end
 
        n_kwclass.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwabstract == old_child then
             if new_child != null then
     do
         if _n_kwabstract == old_child then
             if new_child != null then

@@ -1038,20 +1038,20 @@ redef class AAbstractClasskind
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwabstract)
         v.visit(_n_kwclass)
     end
 
     do
         v.visit(_n_kwabstract)
         v.visit(_n_kwclass)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwabstract)
         v.visit(_n_kwclass)
     end
 end
 redef class AInterfaceClasskind
     do
         v.visit(_n_kwabstract)
         v.visit(_n_kwclass)
     end
 end
 redef class AInterfaceClasskind

-    redef meth n_kwinterface=(n)
+    redef fun n_kwinterface=(n)

     do
         _n_kwinterface = n
        n.parent = self
     do
         _n_kwinterface = n
        n.parent = self

@@ -1068,7 +1068,7 @@ redef class AInterfaceClasskind
        n_kwinterface.parent = self
     end
 
        n_kwinterface.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwinterface == old_child then
             if new_child != null then
     do
         if _n_kwinterface == old_child then
             if new_child != null then

@@ -1082,18 +1082,18 @@ redef class AInterfaceClasskind
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwinterface)
     end
 
     do
         v.visit(_n_kwinterface)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwinterface)
     end
 end
 redef class AUniversalClasskind
     do
         v.visit(_n_kwinterface)
     end
 end
 redef class AUniversalClasskind

-    redef meth n_kwuniversal=(n)
+    redef fun n_kwuniversal=(n)

     do
         _n_kwuniversal = n
        n.parent = self
     do
         _n_kwuniversal = n
        n.parent = self

@@ -1110,7 +1110,7 @@ redef class AUniversalClasskind
        n_kwuniversal.parent = self
     end
 
        n_kwuniversal.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwuniversal == old_child then
             if new_child != null then
     do
         if _n_kwuniversal == old_child then
             if new_child != null then

@@ -1124,23 +1124,23 @@ redef class AUniversalClasskind
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwuniversal)
     end
 
     do
         v.visit(_n_kwuniversal)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwuniversal)
     end
 end
 redef class AFormaldef
     do
         v.visit(_n_kwuniversal)
     end
 end
 redef class AFormaldef

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
         if n != null then
     do
         _n_type = n
         if n != null then

@@ -1164,7 +1164,7 @@ redef class AFormaldef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -1188,7 +1188,7 @@ redef class AFormaldef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
         if _n_type != null then
     do
         v.visit(_n_id)
         if _n_type != null then

@@ -1196,7 +1196,7 @@ redef class AFormaldef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
         if _n_type != null then
     do
         v.visit(_n_id)
         if _n_type != null then

@@ -1205,12 +1205,12 @@ redef class AFormaldef
     end
 end
 redef class ASuperclass
     end
 end
 redef class ASuperclass

-    redef meth n_kwspecial=(n)
+    redef fun n_kwspecial=(n)

     do
         _n_kwspecial = n
        n.parent = self
     end
     do
         _n_kwspecial = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
        n.parent = self
     do
         _n_type = n
        n.parent = self

@@ -1230,7 +1230,7 @@ redef class ASuperclass
        n_type.parent = self
     end
 
        n_type.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwspecial == old_child then
             if new_child != null then
     do
         if _n_kwspecial == old_child then
             if new_child != null then

@@ -1254,79 +1254,79 @@ redef class ASuperclass
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwspecial)
         v.visit(_n_type)
     end
 
     do
         v.visit(_n_kwspecial)
         v.visit(_n_type)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwspecial)
         v.visit(_n_type)
     end
 end
 redef class AAttrPropdef
     do
         v.visit(_n_kwspecial)
         v.visit(_n_type)
     end
 end
 redef class AAttrPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_readable=(n)
+    redef fun n_readable=(n)

     do
         _n_readable = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_readable = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_writable=(n)
+    redef fun n_writable=(n)

     do
         _n_writable = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_writable = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwattr=(n)
+    redef fun n_kwattr=(n)

     do
         _n_kwattr = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwattr = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwvar=(n)
+    redef fun n_kwvar=(n)

     do
         _n_kwvar = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwvar = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -1388,7 +1388,7 @@ redef class AAttrPropdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -1492,7 +1492,7 @@ redef class AAttrPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1522,7 +1522,7 @@ redef class AAttrPropdef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1553,31 +1553,31 @@ redef class AAttrPropdef
     end
 end
 redef class AMethPropdef
     end
 end
 redef class AMethPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
        n.parent = self
     end
     do
         _n_methid = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     do
         _n_signature = n
        n.parent = self

@@ -1610,7 +1610,7 @@ redef class AMethPropdef
        n_signature.parent = self
     end
 
        n_signature.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -1664,7 +1664,7 @@ redef class AMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1677,7 +1677,7 @@ redef class AMethPropdef
         v.visit(_n_signature)
     end
 
         v.visit(_n_signature)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1691,36 +1691,36 @@ redef class AMethPropdef
     end
 end
 redef class ADeferredMethPropdef
     end
 end
 redef class ADeferredMethPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwmeth=(n)
+    redef fun n_kwmeth=(n)

     do
         _n_kwmeth = n
        n.parent = self
     end
     do
         _n_kwmeth = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
        n.parent = self
     end
     do
         _n_methid = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     do
         _n_signature = n
        n.parent = self

@@ -1756,7 +1756,7 @@ redef class ADeferredMethPropdef
        n_signature.parent = self
     end
 
        n_signature.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -1820,7 +1820,7 @@ redef class ADeferredMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1834,7 +1834,7 @@ redef class ADeferredMethPropdef
         v.visit(_n_signature)
     end
 
         v.visit(_n_signature)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1849,36 +1849,36 @@ redef class ADeferredMethPropdef
     end
 end
 redef class AInternMethPropdef
     end
 end
 redef class AInternMethPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwmeth=(n)
+    redef fun n_kwmeth=(n)

     do
         _n_kwmeth = n
        n.parent = self
     end
     do
         _n_kwmeth = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
        n.parent = self
     end
     do
         _n_methid = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     do
         _n_signature = n
        n.parent = self

@@ -1914,7 +1914,7 @@ redef class AInternMethPropdef
        n_signature.parent = self
     end
 
        n_signature.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -1978,7 +1978,7 @@ redef class AInternMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -1992,7 +1992,7 @@ redef class AInternMethPropdef
         v.visit(_n_signature)
     end
 
         v.visit(_n_signature)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2007,41 +2007,41 @@ redef class AInternMethPropdef
     end
 end
 redef class AExternMethPropdef
     end
 end
 redef class AExternMethPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwmeth=(n)
+    redef fun n_kwmeth=(n)

     do
         _n_kwmeth = n
        n.parent = self
     end
     do
         _n_kwmeth = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
        n.parent = self
     end
     do
         _n_methid = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     end
     do
         _n_signature = n
        n.parent = self
     end

-    redef meth n_extern=(n)
+    redef fun n_extern=(n)

     do
         _n_extern = n
         if n != null then
     do
         _n_extern = n
         if n != null then

@@ -2084,7 +2084,7 @@ redef class AExternMethPropdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -2158,7 +2158,7 @@ redef class AExternMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2175,7 +2175,7 @@ redef class AExternMethPropdef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2193,41 +2193,41 @@ redef class AExternMethPropdef
     end
 end
 redef class AConcreteMethPropdef
     end
 end
 redef class AConcreteMethPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwmeth=(n)
+    redef fun n_kwmeth=(n)

     do
         _n_kwmeth = n
        n.parent = self
     end
     do
         _n_kwmeth = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
        n.parent = self
     end
     do
         _n_methid = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     end
     do
         _n_signature = n
        n.parent = self
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -2270,7 +2270,7 @@ redef class AConcreteMethPropdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -2344,7 +2344,7 @@ redef class AConcreteMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2361,7 +2361,7 @@ redef class AConcreteMethPropdef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2379,43 +2379,43 @@ redef class AConcreteMethPropdef
     end
 end
 redef class AConcreteInitPropdef
     end
 end
 redef class AConcreteInitPropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwinit=(n)
+    redef fun n_kwinit=(n)

     do
         _n_kwinit = n
        n.parent = self
     end
     do
         _n_kwinit = n
        n.parent = self
     end

-    redef meth n_methid=(n)
+    redef fun n_methid=(n)

     do
         _n_methid = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_methid = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     end
     do
         _n_signature = n
        n.parent = self
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -2460,7 +2460,7 @@ redef class AConcreteInitPropdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -2534,7 +2534,7 @@ redef class AConcreteInitPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2553,7 +2553,7 @@ redef class AConcreteInitPropdef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2573,14 +2573,14 @@ redef class AConcreteInitPropdef
     end
 end
 redef class AMainMethPropdef
     end
 end
 redef class AMainMethPropdef

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -2606,7 +2606,7 @@ redef class AMainMethPropdef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwredef == old_child then
             if new_child != null then
     do
         if _n_kwredef == old_child then
             if new_child != null then

@@ -2630,7 +2630,7 @@ redef class AMainMethPropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2640,7 +2640,7 @@ redef class AMainMethPropdef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2651,36 +2651,36 @@ redef class AMainMethPropdef
     end
 end
 redef class ATypePropdef
     end
 end
 redef class ATypePropdef

-    redef meth n_doc=(n)
+    redef fun n_doc=(n)

     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_doc = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_visibility=(n)
+    redef fun n_visibility=(n)

     do
         _n_visibility = n
        n.parent = self
     end
     do
         _n_visibility = n
        n.parent = self
     end

-    redef meth n_kwtype=(n)
+    redef fun n_kwtype=(n)

     do
         _n_kwtype = n
        n.parent = self
     end
     do
         _n_kwtype = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
        n.parent = self
     do
         _n_type = n
        n.parent = self

@@ -2716,7 +2716,7 @@ redef class ATypePropdef
        n_type.parent = self
     end
 
        n_type.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_doc == old_child then
             if new_child != null then
     do
         if _n_doc == old_child then
             if new_child != null then

@@ -2780,7 +2780,7 @@ redef class ATypePropdef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2794,7 +2794,7 @@ redef class ATypePropdef
         v.visit(_n_type)
     end
 
         v.visit(_n_type)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))
     do
         if _n_doc != null then
             v.visit(_n_doc.as(not null))

@@ -2809,14 +2809,14 @@ redef class ATypePropdef
     end
 end
 redef class AReadAble
     end
 end
 redef class AReadAble

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwreadable=(n)
+    redef fun n_kwreadable=(n)

     do
         _n_kwreadable = n
        n.parent = self
     do
         _n_kwreadable = n
        n.parent = self

@@ -2838,7 +2838,7 @@ redef class AReadAble
        n_kwreadable.parent = self
     end
 
        n_kwreadable.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwredef == old_child then
             if new_child != null then
     do
         if _n_kwredef == old_child then
             if new_child != null then

@@ -2862,7 +2862,7 @@ redef class AReadAble
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2870,7 +2870,7 @@ redef class AReadAble
         v.visit(_n_kwreadable)
     end
 
         v.visit(_n_kwreadable)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2879,14 +2879,14 @@ redef class AReadAble
     end
 end
 redef class AWriteAble
     end
 end
 redef class AWriteAble

-    redef meth n_kwredef=(n)
+    redef fun n_kwredef=(n)

     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwredef = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwwritable=(n)
+    redef fun n_kwwritable=(n)

     do
         _n_kwwritable = n
        n.parent = self
     do
         _n_kwwritable = n
        n.parent = self

@@ -2908,7 +2908,7 @@ redef class AWriteAble
        n_kwwritable.parent = self
     end
 
        n_kwwritable.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwredef == old_child then
             if new_child != null then
     do
         if _n_kwredef == old_child then
             if new_child != null then

@@ -2932,7 +2932,7 @@ redef class AWriteAble
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2940,7 +2940,7 @@ redef class AWriteAble
         v.visit(_n_kwwritable)
     end
 
         v.visit(_n_kwwritable)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))
     do
         if _n_kwredef != null then
             v.visit(_n_kwredef.as(not null))

@@ -2949,7 +2949,7 @@ redef class AWriteAble
     end
 end
 redef class AIdMethid
     end
 end
 redef class AIdMethid

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -2966,7 +2966,7 @@ redef class AIdMethid
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -2980,18 +2980,18 @@ redef class AIdMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
     end
 
     do
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
     end
 end
 redef class APlusMethid
     do
         v.visit(_n_id)
     end
 end
 redef class APlusMethid

-    redef meth n_plus=(n)
+    redef fun n_plus=(n)

     do
         _n_plus = n
        n.parent = self
     do
         _n_plus = n
        n.parent = self

@@ -3008,7 +3008,7 @@ redef class APlusMethid
        n_plus.parent = self
     end
 
        n_plus.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_plus == old_child then
             if new_child != null then
     do
         if _n_plus == old_child then
             if new_child != null then

@@ -3022,18 +3022,18 @@ redef class APlusMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_plus)
     end
 
     do
         v.visit(_n_plus)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_plus)
     end
 end
 redef class AMinusMethid
     do
         v.visit(_n_plus)
     end
 end
 redef class AMinusMethid

-    redef meth n_minus=(n)
+    redef fun n_minus=(n)

     do
         _n_minus = n
        n.parent = self
     do
         _n_minus = n
        n.parent = self

@@ -3050,7 +3050,7 @@ redef class AMinusMethid
        n_minus.parent = self
     end
 
        n_minus.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_minus == old_child then
             if new_child != null then
     do
         if _n_minus == old_child then
             if new_child != null then

@@ -3064,18 +3064,18 @@ redef class AMinusMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_minus)
     end
 
     do
         v.visit(_n_minus)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_minus)
     end
 end
 redef class AStarMethid
     do
         v.visit(_n_minus)
     end
 end
 redef class AStarMethid

-    redef meth n_star=(n)
+    redef fun n_star=(n)

     do
         _n_star = n
        n.parent = self
     do
         _n_star = n
        n.parent = self

@@ -3092,7 +3092,7 @@ redef class AStarMethid
        n_star.parent = self
     end
 
        n_star.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_star == old_child then
             if new_child != null then
     do
         if _n_star == old_child then
             if new_child != null then

@@ -3106,18 +3106,18 @@ redef class AStarMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_star)
     end
 
     do
         v.visit(_n_star)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_star)
     end
 end
 redef class ASlashMethid
     do
         v.visit(_n_star)
     end
 end
 redef class ASlashMethid

-    redef meth n_slash=(n)
+    redef fun n_slash=(n)

     do
         _n_slash = n
        n.parent = self
     do
         _n_slash = n
        n.parent = self

@@ -3134,7 +3134,7 @@ redef class ASlashMethid
        n_slash.parent = self
     end
 
        n_slash.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_slash == old_child then
             if new_child != null then
     do
         if _n_slash == old_child then
             if new_child != null then

@@ -3148,18 +3148,18 @@ redef class ASlashMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_slash)
     end
 
     do
         v.visit(_n_slash)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_slash)
     end
 end
 redef class APercentMethid
     do
         v.visit(_n_slash)
     end
 end
 redef class APercentMethid

-    redef meth n_percent=(n)
+    redef fun n_percent=(n)

     do
         _n_percent = n
        n.parent = self
     do
         _n_percent = n
        n.parent = self

@@ -3176,7 +3176,7 @@ redef class APercentMethid
        n_percent.parent = self
     end
 
        n_percent.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_percent == old_child then
             if new_child != null then
     do
         if _n_percent == old_child then
             if new_child != null then

@@ -3190,18 +3190,18 @@ redef class APercentMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_percent)
     end
 
     do
         v.visit(_n_percent)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_percent)
     end
 end
 redef class AEqMethid
     do
         v.visit(_n_percent)
     end
 end
 redef class AEqMethid

-    redef meth n_eq=(n)
+    redef fun n_eq=(n)

     do
         _n_eq = n
        n.parent = self
     do
         _n_eq = n
        n.parent = self

@@ -3218,7 +3218,7 @@ redef class AEqMethid
        n_eq.parent = self
     end
 
        n_eq.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_eq == old_child then
             if new_child != null then
     do
         if _n_eq == old_child then
             if new_child != null then

@@ -3232,18 +3232,18 @@ redef class AEqMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_eq)
     end
 
     do
         v.visit(_n_eq)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_eq)
     end
 end
 redef class ANeMethid
     do
         v.visit(_n_eq)
     end
 end
 redef class ANeMethid

-    redef meth n_ne=(n)
+    redef fun n_ne=(n)

     do
         _n_ne = n
        n.parent = self
     do
         _n_ne = n
        n.parent = self

@@ -3260,7 +3260,7 @@ redef class ANeMethid
        n_ne.parent = self
     end
 
        n_ne.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_ne == old_child then
             if new_child != null then
     do
         if _n_ne == old_child then
             if new_child != null then

@@ -3274,18 +3274,18 @@ redef class ANeMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_ne)
     end
 
     do
         v.visit(_n_ne)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_ne)
     end
 end
 redef class ALeMethid
     do
         v.visit(_n_ne)
     end
 end
 redef class ALeMethid

-    redef meth n_le=(n)
+    redef fun n_le=(n)

     do
         _n_le = n
        n.parent = self
     do
         _n_le = n
        n.parent = self

@@ -3302,7 +3302,7 @@ redef class ALeMethid
        n_le.parent = self
     end
 
        n_le.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_le == old_child then
             if new_child != null then
     do
         if _n_le == old_child then
             if new_child != null then

@@ -3316,18 +3316,18 @@ redef class ALeMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_le)
     end
 
     do
         v.visit(_n_le)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_le)
     end
 end
 redef class AGeMethid
     do
         v.visit(_n_le)
     end
 end
 redef class AGeMethid

-    redef meth n_ge=(n)
+    redef fun n_ge=(n)

     do
         _n_ge = n
        n.parent = self
     do
         _n_ge = n
        n.parent = self

@@ -3344,7 +3344,7 @@ redef class AGeMethid
        n_ge.parent = self
     end
 
        n_ge.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_ge == old_child then
             if new_child != null then
     do
         if _n_ge == old_child then
             if new_child != null then

@@ -3358,18 +3358,18 @@ redef class AGeMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_ge)
     end
 
     do
         v.visit(_n_ge)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_ge)
     end
 end
 redef class ALtMethid
     do
         v.visit(_n_ge)
     end
 end
 redef class ALtMethid

-    redef meth n_lt=(n)
+    redef fun n_lt=(n)

     do
         _n_lt = n
        n.parent = self
     do
         _n_lt = n
        n.parent = self

@@ -3386,7 +3386,7 @@ redef class ALtMethid
        n_lt.parent = self
     end
 
        n_lt.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_lt == old_child then
             if new_child != null then
     do
         if _n_lt == old_child then
             if new_child != null then

@@ -3400,18 +3400,18 @@ redef class ALtMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_lt)
     end
 
     do
         v.visit(_n_lt)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_lt)
     end
 end
 redef class AGtMethid
     do
         v.visit(_n_lt)
     end
 end
 redef class AGtMethid

-    redef meth n_gt=(n)
+    redef fun n_gt=(n)

     do
         _n_gt = n
        n.parent = self
     do
         _n_gt = n
        n.parent = self

@@ -3428,7 +3428,7 @@ redef class AGtMethid
        n_gt.parent = self
     end
 
        n_gt.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_gt == old_child then
             if new_child != null then
     do
         if _n_gt == old_child then
             if new_child != null then

@@ -3442,23 +3442,23 @@ redef class AGtMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_gt)
     end
 
     do
         v.visit(_n_gt)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_gt)
     end
 end
 redef class ABraMethid
     do
         v.visit(_n_gt)
     end
 end
 redef class ABraMethid

-    redef meth n_obra=(n)
+    redef fun n_obra=(n)

     do
         _n_obra = n
        n.parent = self
     end
     do
         _n_obra = n
        n.parent = self
     end

-    redef meth n_cbra=(n)
+    redef fun n_cbra=(n)

     do
         _n_cbra = n
        n.parent = self
     do
         _n_cbra = n
        n.parent = self

@@ -3478,7 +3478,7 @@ redef class ABraMethid
        n_cbra.parent = self
     end
 
        n_cbra.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_obra == old_child then
             if new_child != null then
     do
         if _n_obra == old_child then
             if new_child != null then

@@ -3502,20 +3502,20 @@ redef class ABraMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
     end
 
     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
     end
 end
 redef class AStarshipMethid
     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
     end
 end
 redef class AStarshipMethid

-    redef meth n_starship=(n)
+    redef fun n_starship=(n)

     do
         _n_starship = n
        n.parent = self
     do
         _n_starship = n
        n.parent = self

@@ -3532,7 +3532,7 @@ redef class AStarshipMethid
        n_starship.parent = self
     end
 
        n_starship.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_starship == old_child then
             if new_child != null then
     do
         if _n_starship == old_child then
             if new_child != null then

@@ -3546,23 +3546,23 @@ redef class AStarshipMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_starship)
     end
 
     do
         v.visit(_n_starship)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_starship)
     end
 end
 redef class AAssignMethid
     do
         v.visit(_n_starship)
     end
 end
 redef class AAssignMethid

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     do
         _n_assign = n
        n.parent = self

@@ -3582,7 +3582,7 @@ redef class AAssignMethid
        n_assign.parent = self
     end
 
        n_assign.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -3606,30 +3606,30 @@ redef class AAssignMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign)
     end
 
     do
         v.visit(_n_id)
         v.visit(_n_assign)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign)
     end
 end
 redef class ABraassignMethid
     do
         v.visit(_n_id)
         v.visit(_n_assign)
     end
 end
 redef class ABraassignMethid

-    redef meth n_obra=(n)
+    redef fun n_obra=(n)

     do
         _n_obra = n
        n.parent = self
     end
     do
         _n_obra = n
        n.parent = self
     end

-    redef meth n_cbra=(n)
+    redef fun n_cbra=(n)

     do
         _n_cbra = n
        n.parent = self
     end
     do
         _n_cbra = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     do
         _n_assign = n
        n.parent = self

@@ -3652,7 +3652,7 @@ redef class ABraassignMethid
        n_assign.parent = self
     end
 
        n_assign.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_obra == old_child then
             if new_child != null then
     do
         if _n_obra == old_child then
             if new_child != null then

@@ -3686,14 +3686,14 @@ redef class ABraassignMethid
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
         v.visit(_n_assign)
     end
 
     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
         v.visit(_n_assign)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_obra)
         v.visit(_n_cbra)
     do
         v.visit(_n_obra)
         v.visit(_n_cbra)

@@ -3701,7 +3701,7 @@ redef class ABraassignMethid
     end
 end
 redef class ASignature
     end
 end
 redef class ASignature

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
         if n != null then
     do
         _n_type = n
         if n != null then

@@ -3734,7 +3734,7 @@ redef class ASignature
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_params.length[ do
             if _n_params[i] == old_child then
     do
         for i in [0.._n_params.length[ do
             if _n_params[i] == old_child then

@@ -3772,7 +3772,7 @@ redef class ASignature
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_params do
                 v.visit(n)
     do
             for n in _n_params do
                 v.visit(n)

@@ -3785,7 +3785,7 @@ redef class ASignature
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_params.length
     do
        do
            var i = _n_params.length

@@ -3807,19 +3807,19 @@ redef class ASignature
     end
 end
 redef class AParam
     end
 end
 redef class AParam

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_dotdotdot=(n)
+    redef fun n_dotdotdot=(n)

     do
         _n_dotdotdot = n
         if n != null then
     do
         _n_dotdotdot = n
         if n != null then

@@ -3848,7 +3848,7 @@ redef class AParam
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -3882,7 +3882,7 @@ redef class AParam
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
         if _n_type != null then
     do
         v.visit(_n_id)
         if _n_type != null then

@@ -3893,7 +3893,7 @@ redef class AParam
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
         if _n_type != null then
     do
         v.visit(_n_id)
         if _n_type != null then

@@ -3905,29 +3905,29 @@ redef class AParam
     end
 end
 redef class AClosureDecl
     end
 end
 redef class AClosureDecl

-    redef meth n_kwwith=(n)
+    redef fun n_kwwith=(n)

     do
         _n_kwwith = n
        n.parent = self
     end
     do
         _n_kwwith = n
        n.parent = self
     end

-    redef meth n_kwbreak=(n)
+    redef fun n_kwbreak=(n)

     do
         _n_kwbreak = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwbreak = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_signature=(n)
+    redef fun n_signature=(n)

     do
         _n_signature = n
        n.parent = self
     end
     do
         _n_signature = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -3962,7 +3962,7 @@ redef class AClosureDecl
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwwith == old_child then
             if new_child != null then
     do
         if _n_kwwith == old_child then
             if new_child != null then

@@ -4016,7 +4016,7 @@ redef class AClosureDecl
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwwith)
         if _n_kwbreak != null then
     do
         v.visit(_n_kwwith)
         if _n_kwbreak != null then

@@ -4029,7 +4029,7 @@ redef class AClosureDecl
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwwith)
         if _n_kwbreak != null then
     do
         v.visit(_n_kwwith)
         if _n_kwbreak != null then

@@ -4043,14 +4043,14 @@ redef class AClosureDecl
     end
 end
 redef class AType
     end
 end
 redef class AType

-    redef meth n_kwnullable=(n)
+    redef fun n_kwnullable=(n)

     do
         _n_kwnullable = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_kwnullable = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -4078,7 +4078,7 @@ redef class AType
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwnullable == old_child then
             if new_child != null then
     do
         if _n_kwnullable == old_child then
             if new_child != null then

@@ -4114,7 +4114,7 @@ redef class AType
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_kwnullable != null then
             v.visit(_n_kwnullable.as(not null))
     do
         if _n_kwnullable != null then
             v.visit(_n_kwnullable.as(not null))

@@ -4125,7 +4125,7 @@ redef class AType
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_kwnullable != null then
             v.visit(_n_kwnullable.as(not null))
     do
         if _n_kwnullable != null then
             v.visit(_n_kwnullable.as(not null))

@@ -4156,7 +4156,7 @@ redef class ABlockExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_expr.length[ do
             if _n_expr[i] == old_child then
     do
         for i in [0.._n_expr.length[ do
             if _n_expr[i] == old_child then

@@ -4172,14 +4172,14 @@ redef class ABlockExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_expr do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_expr do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_expr.length
     do
        do
            var i = _n_expr.length

@@ -4191,31 +4191,31 @@ redef class ABlockExpr
     end
 end
 redef class AVardeclExpr
     end
 end
 redef class AVardeclExpr

-    redef meth n_kwvar=(n)
+    redef fun n_kwvar=(n)

     do
         _n_kwvar = n
        n.parent = self
     end
     do
         _n_kwvar = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_type = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_assign = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -4252,7 +4252,7 @@ redef class AVardeclExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwvar == old_child then
             if new_child != null then
     do
         if _n_kwvar == old_child then
             if new_child != null then

@@ -4306,7 +4306,7 @@ redef class AVardeclExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwvar)
         v.visit(_n_id)
     do
         v.visit(_n_kwvar)
         v.visit(_n_id)

@@ -4321,7 +4321,7 @@ redef class AVardeclExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwvar)
         v.visit(_n_id)
     do
         v.visit(_n_kwvar)
         v.visit(_n_id)

@@ -4337,12 +4337,12 @@ redef class AVardeclExpr
     end
 end
 redef class AReturnExpr
     end
 end
 redef class AReturnExpr

-    redef meth n_kwreturn=(n)
+    redef fun n_kwreturn=(n)

     do
         _n_kwreturn = n
        n.parent = self
     end
     do
         _n_kwreturn = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -4366,7 +4366,7 @@ redef class AReturnExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwreturn == old_child then
             if new_child != null then
     do
         if _n_kwreturn == old_child then
             if new_child != null then

@@ -4390,7 +4390,7 @@ redef class AReturnExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwreturn)
         if _n_expr != null then
     do
         v.visit(_n_kwreturn)
         if _n_expr != null then

@@ -4398,7 +4398,7 @@ redef class AReturnExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwreturn)
         if _n_expr != null then
     do
         v.visit(_n_kwreturn)
         if _n_expr != null then

@@ -4407,12 +4407,12 @@ redef class AReturnExpr
     end
 end
 redef class ABreakExpr
     end
 end
 redef class ABreakExpr

-    redef meth n_kwbreak=(n)
+    redef fun n_kwbreak=(n)

     do
         _n_kwbreak = n
        n.parent = self
     end
     do
         _n_kwbreak = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -4436,7 +4436,7 @@ redef class ABreakExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwbreak == old_child then
             if new_child != null then
     do
         if _n_kwbreak == old_child then
             if new_child != null then

@@ -4460,7 +4460,7 @@ redef class ABreakExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwbreak)
         if _n_expr != null then
     do
         v.visit(_n_kwbreak)
         if _n_expr != null then

@@ -4468,7 +4468,7 @@ redef class ABreakExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwbreak)
         if _n_expr != null then
     do
         v.visit(_n_kwbreak)
         if _n_expr != null then

@@ -4477,7 +4477,7 @@ redef class ABreakExpr
     end
 end
 redef class AAbortExpr
     end
 end
 redef class AAbortExpr

-    redef meth n_kwabort=(n)
+    redef fun n_kwabort=(n)

     do
         _n_kwabort = n
        n.parent = self
     do
         _n_kwabort = n
        n.parent = self

@@ -4494,7 +4494,7 @@ redef class AAbortExpr
        n_kwabort.parent = self
     end
 
        n_kwabort.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwabort == old_child then
             if new_child != null then
     do
         if _n_kwabort == old_child then
             if new_child != null then

@@ -4508,23 +4508,23 @@ redef class AAbortExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwabort)
     end
 
     do
         v.visit(_n_kwabort)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwabort)
     end
 end
 redef class AContinueExpr
     do
         v.visit(_n_kwabort)
     end
 end
 redef class AContinueExpr

-    redef meth n_kwcontinue=(n)
+    redef fun n_kwcontinue=(n)

     do
         _n_kwcontinue = n
        n.parent = self
     end
     do
         _n_kwcontinue = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -4548,7 +4548,7 @@ redef class AContinueExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwcontinue == old_child then
             if new_child != null then
     do
         if _n_kwcontinue == old_child then
             if new_child != null then

@@ -4572,7 +4572,7 @@ redef class AContinueExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwcontinue)
         if _n_expr != null then
     do
         v.visit(_n_kwcontinue)
         if _n_expr != null then

@@ -4580,7 +4580,7 @@ redef class AContinueExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwcontinue)
         if _n_expr != null then
     do
         v.visit(_n_kwcontinue)
         if _n_expr != null then

@@ -4589,12 +4589,12 @@ redef class AContinueExpr
     end
 end
 redef class ADoExpr
     end
 end
 redef class ADoExpr

-    redef meth n_kwdo=(n)
+    redef fun n_kwdo=(n)

     do
         _n_kwdo = n
        n.parent = self
     end
     do
         _n_kwdo = n
        n.parent = self
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -4618,7 +4618,7 @@ redef class ADoExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwdo == old_child then
             if new_child != null then
     do
         if _n_kwdo == old_child then
             if new_child != null then

@@ -4642,7 +4642,7 @@ redef class ADoExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwdo)
         if _n_block != null then
     do
         v.visit(_n_kwdo)
         if _n_block != null then

@@ -4650,7 +4650,7 @@ redef class ADoExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwdo)
         if _n_block != null then
     do
         v.visit(_n_kwdo)
         if _n_block != null then

@@ -4659,24 +4659,24 @@ redef class ADoExpr
     end
 end
 redef class AIfExpr
     end
 end
 redef class AIfExpr

-    redef meth n_kwif=(n)
+    redef fun n_kwif=(n)

     do
         _n_kwif = n
        n.parent = self
     end
     do
         _n_kwif = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_then=(n)
+    redef fun n_then=(n)

     do
         _n_then = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_then = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_else=(n)
+    redef fun n_else=(n)

     do
         _n_else = n
         if n != null then
     do
         _n_else = n
         if n != null then

@@ -4708,7 +4708,7 @@ redef class AIfExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwif == old_child then
             if new_child != null then
     do
         if _n_kwif == old_child then
             if new_child != null then

@@ -4752,7 +4752,7 @@ redef class AIfExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwif)
         v.visit(_n_expr)
     do
         v.visit(_n_kwif)
         v.visit(_n_expr)

@@ -4764,7 +4764,7 @@ redef class AIfExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwif)
         v.visit(_n_expr)
     do
         v.visit(_n_kwif)
         v.visit(_n_expr)

@@ -4777,32 +4777,32 @@ redef class AIfExpr
     end
 end
 redef class AIfexprExpr
     end
 end
 redef class AIfexprExpr

-    redef meth n_kwif=(n)
+    redef fun n_kwif=(n)

     do
         _n_kwif = n
        n.parent = self
     end
     do
         _n_kwif = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwthen=(n)
+    redef fun n_kwthen=(n)

     do
         _n_kwthen = n
        n.parent = self
     end
     do
         _n_kwthen = n
        n.parent = self
     end

-    redef meth n_then=(n)
+    redef fun n_then=(n)

     do
         _n_then = n
        n.parent = self
     end
     do
         _n_then = n
        n.parent = self
     end

-    redef meth n_kwelse=(n)
+    redef fun n_kwelse=(n)

     do
         _n_kwelse = n
        n.parent = self
     end
     do
         _n_kwelse = n
        n.parent = self
     end

-    redef meth n_else=(n)
+    redef fun n_else=(n)

     do
         _n_else = n
        n.parent = self
     do
         _n_else = n
        n.parent = self

@@ -4834,7 +4834,7 @@ redef class AIfexprExpr
        n_else.parent = self
     end
 
        n_else.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwif == old_child then
             if new_child != null then
     do
         if _n_kwif == old_child then
             if new_child != null then

@@ -4898,7 +4898,7 @@ redef class AIfexprExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwif)
         v.visit(_n_expr)
     do
         v.visit(_n_kwif)
         v.visit(_n_expr)

@@ -4908,7 +4908,7 @@ redef class AIfexprExpr
         v.visit(_n_else)
     end
 
         v.visit(_n_else)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwif)
         v.visit(_n_expr)
     do
         v.visit(_n_kwif)
         v.visit(_n_expr)

@@ -4919,22 +4919,22 @@ redef class AIfexprExpr
     end
 end
 redef class AWhileExpr
     end
 end
 redef class AWhileExpr

-    redef meth n_kwwhile=(n)
+    redef fun n_kwwhile=(n)

     do
         _n_kwwhile = n
        n.parent = self
     end
     do
         _n_kwwhile = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwdo=(n)
+    redef fun n_kwdo=(n)

     do
         _n_kwdo = n
        n.parent = self
     end
     do
         _n_kwdo = n
        n.parent = self
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -4964,7 +4964,7 @@ redef class AWhileExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwwhile == old_child then
             if new_child != null then
     do
         if _n_kwwhile == old_child then
             if new_child != null then

@@ -5008,7 +5008,7 @@ redef class AWhileExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwwhile)
         v.visit(_n_expr)
     do
         v.visit(_n_kwwhile)
         v.visit(_n_expr)

@@ -5018,7 +5018,7 @@ redef class AWhileExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwwhile)
         v.visit(_n_expr)
     do
         v.visit(_n_kwwhile)
         v.visit(_n_expr)

@@ -5029,27 +5029,27 @@ redef class AWhileExpr
     end
 end
 redef class AForExpr
     end
 end
 redef class AForExpr

-    redef meth n_kwfor=(n)
+    redef fun n_kwfor=(n)

     do
         _n_kwfor = n
        n.parent = self
     end
     do
         _n_kwfor = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwdo=(n)
+    redef fun n_kwdo=(n)

     do
         _n_kwdo = n
        n.parent = self
     end
     do
         _n_kwdo = n
        n.parent = self
     end

-    redef meth n_block=(n)
+    redef fun n_block=(n)

     do
         _n_block = n
         if n != null then
     do
         _n_block = n
         if n != null then

@@ -5082,7 +5082,7 @@ redef class AForExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwfor == old_child then
             if new_child != null then
     do
         if _n_kwfor == old_child then
             if new_child != null then

@@ -5136,7 +5136,7 @@ redef class AForExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwfor)
         v.visit(_n_id)
     do
         v.visit(_n_kwfor)
         v.visit(_n_id)

@@ -5147,7 +5147,7 @@ redef class AForExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwfor)
         v.visit(_n_id)
     do
         v.visit(_n_kwfor)
         v.visit(_n_id)

@@ -5159,19 +5159,19 @@ redef class AForExpr
     end
 end
 redef class AAssertExpr
     end
 end
 redef class AAssertExpr

-    redef meth n_kwassert=(n)
+    redef fun n_kwassert=(n)

     do
         _n_kwassert = n
        n.parent = self
     end
     do
         _n_kwassert = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_id = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -5196,7 +5196,7 @@ redef class AAssertExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwassert == old_child then
             if new_child != null then
     do
         if _n_kwassert == old_child then
             if new_child != null then

@@ -5230,7 +5230,7 @@ redef class AAssertExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwassert)
         if _n_id != null then
     do
         v.visit(_n_kwassert)
         if _n_id != null then

@@ -5239,7 +5239,7 @@ redef class AAssertExpr
         v.visit(_n_expr)
     end
 
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwassert)
         if _n_id != null then
     do
         v.visit(_n_kwassert)
         if _n_id != null then

@@ -5249,12 +5249,12 @@ redef class AAssertExpr
     end
 end
 redef class AOnceExpr
     end
 end
 redef class AOnceExpr

-    redef meth n_kwonce=(n)
+    redef fun n_kwonce=(n)

     do
         _n_kwonce = n
        n.parent = self
     end
     do
         _n_kwonce = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -5274,7 +5274,7 @@ redef class AOnceExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwonce == old_child then
             if new_child != null then
     do
         if _n_kwonce == old_child then
             if new_child != null then

@@ -5298,20 +5298,20 @@ redef class AOnceExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwonce)
         v.visit(_n_expr)
     end
 
     do
         v.visit(_n_kwonce)
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwonce)
         v.visit(_n_expr)
     end
 end
 redef class ASendExpr
     do
         v.visit(_n_kwonce)
         v.visit(_n_expr)
     end
 end
 redef class ASendExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -5328,7 +5328,7 @@ redef class ASendExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5342,23 +5342,23 @@ redef class ASendExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
     end
 
     do
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
     end
 end
 redef class ABinopExpr
     do
         v.visit(_n_expr)
     end
 end
 redef class ABinopExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5378,7 +5378,7 @@ redef class ABinopExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5402,25 +5402,25 @@ redef class ABinopExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AOrExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AOrExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5440,7 +5440,7 @@ redef class AOrExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5464,25 +5464,25 @@ redef class AOrExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AAndExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AAndExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5502,7 +5502,7 @@ redef class AAndExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5526,25 +5526,25 @@ redef class AAndExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ANotExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ANotExpr

-    redef meth n_kwnot=(n)
+    redef fun n_kwnot=(n)

     do
         _n_kwnot = n
        n.parent = self
     end
     do
         _n_kwnot = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -5564,7 +5564,7 @@ redef class ANotExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwnot == old_child then
             if new_child != null then
     do
         if _n_kwnot == old_child then
             if new_child != null then

@@ -5588,25 +5588,25 @@ redef class ANotExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwnot)
         v.visit(_n_expr)
     end
 
     do
         v.visit(_n_kwnot)
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwnot)
         v.visit(_n_expr)
     end
 end
 redef class AEqExpr
     do
         v.visit(_n_kwnot)
         v.visit(_n_expr)
     end
 end
 redef class AEqExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5626,7 +5626,7 @@ redef class AEqExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5650,25 +5650,25 @@ redef class AEqExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AEeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AEeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5688,7 +5688,7 @@ redef class AEeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5712,25 +5712,25 @@ redef class AEeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ANeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ANeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5750,7 +5750,7 @@ redef class ANeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5774,25 +5774,25 @@ redef class ANeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ALtExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ALtExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5812,7 +5812,7 @@ redef class ALtExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5836,25 +5836,25 @@ redef class ALtExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ALeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ALeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5874,7 +5874,7 @@ redef class ALeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5898,25 +5898,25 @@ redef class ALeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AGtExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AGtExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5936,7 +5936,7 @@ redef class AGtExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -5960,25 +5960,25 @@ redef class AGtExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AGeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AGeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -5998,7 +5998,7 @@ redef class AGeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6022,25 +6022,25 @@ redef class AGeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AIsaExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AIsaExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
        n.parent = self
     do
         _n_type = n
        n.parent = self

@@ -6060,7 +6060,7 @@ redef class AIsaExpr
        n_type.parent = self
     end
 
        n_type.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6084,25 +6084,25 @@ redef class AIsaExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_type)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_type)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_type)
     end
 end
 redef class APlusExpr
     do
         v.visit(_n_expr)
         v.visit(_n_type)
     end
 end
 redef class APlusExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6122,7 +6122,7 @@ redef class APlusExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6146,25 +6146,25 @@ redef class APlusExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AMinusExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AMinusExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6184,7 +6184,7 @@ redef class AMinusExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6208,25 +6208,25 @@ redef class AMinusExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AStarshipExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AStarshipExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6246,7 +6246,7 @@ redef class AStarshipExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6270,25 +6270,25 @@ redef class AStarshipExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AStarExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AStarExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6308,7 +6308,7 @@ redef class AStarExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6332,25 +6332,25 @@ redef class AStarExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ASlashExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ASlashExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6370,7 +6370,7 @@ redef class ASlashExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6394,25 +6394,25 @@ redef class ASlashExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class APercentExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class APercentExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -6432,7 +6432,7 @@ redef class APercentExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6456,25 +6456,25 @@ redef class APercentExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AUminusExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AUminusExpr

-    redef meth n_minus=(n)
+    redef fun n_minus=(n)

     do
         _n_minus = n
        n.parent = self
     end
     do
         _n_minus = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -6494,7 +6494,7 @@ redef class AUminusExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_minus == old_child then
             if new_child != null then
     do
         if _n_minus == old_child then
             if new_child != null then

@@ -6518,30 +6518,30 @@ redef class AUminusExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_minus)
         v.visit(_n_expr)
     end
 
     do
         v.visit(_n_minus)
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_minus)
         v.visit(_n_expr)
     end
 end
 redef class ANewExpr
     do
         v.visit(_n_minus)
         v.visit(_n_expr)
     end
 end
 redef class ANewExpr

-    redef meth n_kwnew=(n)
+    redef fun n_kwnew=(n)

     do
         _n_kwnew = n
        n.parent = self
     end
     do
         _n_kwnew = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
        n.parent = self
     end
     do
         _n_type = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
         if n != null then
     do
         _n_id = n
         if n != null then

@@ -6574,7 +6574,7 @@ redef class ANewExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwnew == old_child then
             if new_child != null then
     do
         if _n_kwnew == old_child then
             if new_child != null then

@@ -6620,7 +6620,7 @@ redef class ANewExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwnew)
         v.visit(_n_type)
     do
         v.visit(_n_kwnew)
         v.visit(_n_type)

@@ -6632,7 +6632,7 @@ redef class ANewExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwnew)
         v.visit(_n_type)
     do
         v.visit(_n_kwnew)
         v.visit(_n_type)

@@ -6649,12 +6649,12 @@ redef class ANewExpr
     end
 end
 redef class AAttrExpr
     end
 end
 redef class AAttrExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -6674,7 +6674,7 @@ redef class AAttrExpr
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6698,35 +6698,35 @@ redef class AAttrExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 end
 redef class AAttrAssignExpr
     do
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 end
 redef class AAttrAssignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     end
     do
         _n_assign = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -6752,7 +6752,7 @@ redef class AAttrAssignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6796,7 +6796,7 @@ redef class AAttrAssignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -6804,7 +6804,7 @@ redef class AAttrAssignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -6813,22 +6813,22 @@ redef class AAttrAssignExpr
     end
 end
 redef class AAttrReassignExpr
     end
 end
 redef class AAttrReassignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign_op=(n)
+    redef fun n_assign_op=(n)

     do
         _n_assign_op = n
        n.parent = self
     end
     do
         _n_assign_op = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -6854,7 +6854,7 @@ redef class AAttrReassignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -6898,7 +6898,7 @@ redef class AAttrReassignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -6906,7 +6906,7 @@ redef class AAttrReassignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -6915,12 +6915,12 @@ redef class AAttrReassignExpr
     end
 end
 redef class ACallExpr
     end
 end
 redef class ACallExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -6952,7 +6952,7 @@ redef class ACallExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7000,7 +7000,7 @@ redef class ACallExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7012,7 +7012,7 @@ redef class ACallExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7033,22 +7033,22 @@ redef class ACallExpr
     end
 end
 redef class ACallAssignExpr
     end
 end
 redef class ACallAssignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     end
     do
         _n_assign = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -7080,7 +7080,7 @@ redef class ACallAssignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7136,7 +7136,7 @@ redef class ACallAssignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7147,7 +7147,7 @@ redef class ACallAssignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7163,22 +7163,22 @@ redef class ACallAssignExpr
     end
 end
 redef class ACallReassignExpr
     end
 end
 redef class ACallReassignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign_op=(n)
+    redef fun n_assign_op=(n)

     do
         _n_assign_op = n
        n.parent = self
     end
     do
         _n_assign_op = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -7210,7 +7210,7 @@ redef class ACallReassignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7266,7 +7266,7 @@ redef class ACallReassignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7277,7 +7277,7 @@ redef class ACallReassignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_id)
     do
         v.visit(_n_expr)
         v.visit(_n_id)

@@ -7293,14 +7293,14 @@ redef class ACallReassignExpr
     end
 end
 redef class ASuperExpr
     end
 end
 redef class ASuperExpr

-    redef meth n_qualified=(n)
+    redef fun n_qualified=(n)

     do
         _n_qualified = n
         if n != null then
            n.parent = self
         end
     end
     do
         _n_qualified = n
         if n != null then
            n.parent = self
         end
     end

-    redef meth n_kwsuper=(n)
+    redef fun n_kwsuper=(n)

     do
         _n_kwsuper = n
        n.parent = self
     do
         _n_kwsuper = n
        n.parent = self

@@ -7328,7 +7328,7 @@ redef class ASuperExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_qualified == old_child then
             if new_child != null then
     do
         if _n_qualified == old_child then
             if new_child != null then

@@ -7364,7 +7364,7 @@ redef class ASuperExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_qualified != null then
             v.visit(_n_qualified.as(not null))
     do
         if _n_qualified != null then
             v.visit(_n_qualified.as(not null))

@@ -7375,7 +7375,7 @@ redef class ASuperExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_qualified != null then
             v.visit(_n_qualified.as(not null))
     do
         if _n_qualified != null then
             v.visit(_n_qualified.as(not null))

@@ -7391,12 +7391,12 @@ redef class ASuperExpr
     end
 end
 redef class AInitExpr
     end
 end
 redef class AInitExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwinit=(n)
+    redef fun n_kwinit=(n)

     do
         _n_kwinit = n
        n.parent = self
     do
         _n_kwinit = n
        n.parent = self

@@ -7422,7 +7422,7 @@ redef class AInitExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7458,7 +7458,7 @@ redef class AInitExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwinit)
     do
         v.visit(_n_expr)
         v.visit(_n_kwinit)

@@ -7467,7 +7467,7 @@ redef class AInitExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwinit)
     do
         v.visit(_n_expr)
         v.visit(_n_kwinit)

@@ -7481,7 +7481,7 @@ redef class AInitExpr
     end
 end
 redef class ABraExpr
     end
 end
 redef class ABraExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -7510,7 +7510,7 @@ redef class ABraExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7548,7 +7548,7 @@ redef class ABraExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
             for n in _n_args do
     do
         v.visit(_n_expr)
             for n in _n_args do

@@ -7559,7 +7559,7 @@ redef class ABraExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
        do
     do
         v.visit(_n_expr)
        do

@@ -7579,17 +7579,17 @@ redef class ABraExpr
     end
 end
 redef class ABraAssignExpr
     end
 end
 redef class ABraAssignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     end
     do
         _n_assign = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -7618,7 +7618,7 @@ redef class ABraAssignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7664,7 +7664,7 @@ redef class ABraAssignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
             for n in _n_args do
     do
         v.visit(_n_expr)
             for n in _n_args do

@@ -7674,7 +7674,7 @@ redef class ABraAssignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
        do
     do
         v.visit(_n_expr)
        do

@@ -7689,17 +7689,17 @@ redef class ABraAssignExpr
     end
 end
 redef class ABraReassignExpr
     end
 end
 redef class ABraReassignExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_assign_op=(n)
+    redef fun n_assign_op=(n)

     do
         _n_assign_op = n
        n.parent = self
     end
     do
         _n_assign_op = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -7728,7 +7728,7 @@ redef class ABraReassignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -7774,7 +7774,7 @@ redef class ABraReassignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
             for n in _n_args do
     do
         v.visit(_n_expr)
             for n in _n_args do

@@ -7784,7 +7784,7 @@ redef class ABraReassignExpr
         v.visit(_n_value)
     end
 
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
        do
     do
         v.visit(_n_expr)
        do

@@ -7799,7 +7799,7 @@ redef class ABraReassignExpr
     end
 end
 redef class AClosureCallExpr
     end
 end
 redef class AClosureCallExpr

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -7828,7 +7828,7 @@ redef class AClosureCallExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -7866,7 +7866,7 @@ redef class AClosureCallExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
             for n in _n_args do
     do
         v.visit(_n_id)
             for n in _n_args do

@@ -7877,7 +7877,7 @@ redef class AClosureCallExpr
            end
     end
 
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
        do
     do
         v.visit(_n_id)
        do

@@ -7897,7 +7897,7 @@ redef class AClosureCallExpr
     end
 end
 redef class AVarExpr
     end
 end
 redef class AVarExpr

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -7914,7 +7914,7 @@ redef class AVarExpr
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -7928,28 +7928,28 @@ redef class AVarExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
     end
 
     do
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
     end
 end
 redef class AVarAssignExpr
     do
         v.visit(_n_id)
     end
 end
 redef class AVarAssignExpr

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign=(n)
+    redef fun n_assign=(n)

     do
         _n_assign = n
        n.parent = self
     end
     do
         _n_assign = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -7972,7 +7972,7 @@ redef class AVarAssignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -8006,14 +8006,14 @@ redef class AVarAssignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign)
         v.visit(_n_value)
     end
 
     do
         v.visit(_n_id)
         v.visit(_n_assign)
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign)
     do
         v.visit(_n_id)
         v.visit(_n_assign)

@@ -8021,17 +8021,17 @@ redef class AVarAssignExpr
     end
 end
 redef class AVarReassignExpr
     end
 end
 redef class AVarReassignExpr

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     end
     do
         _n_id = n
        n.parent = self
     end

-    redef meth n_assign_op=(n)
+    redef fun n_assign_op=(n)

     do
         _n_assign_op = n
        n.parent = self
     end
     do
         _n_assign_op = n
        n.parent = self
     end

-    redef meth n_value=(n)
+    redef fun n_value=(n)

     do
         _n_value = n
        n.parent = self
     do
         _n_value = n
        n.parent = self

@@ -8054,7 +8054,7 @@ redef class AVarReassignExpr
        n_value.parent = self
     end
 
        n_value.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_id == old_child then
             if new_child != null then
     do
         if _n_id == old_child then
             if new_child != null then

@@ -8088,14 +8088,14 @@ redef class AVarReassignExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign_op)
         v.visit(_n_value)
     end
 
     do
         v.visit(_n_id)
         v.visit(_n_assign_op)
         v.visit(_n_value)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_id)
         v.visit(_n_assign_op)
     do
         v.visit(_n_id)
         v.visit(_n_assign_op)

@@ -8103,12 +8103,12 @@ redef class AVarReassignExpr
     end
 end
 redef class ARangeExpr
     end
 end
 redef class ARangeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -8128,7 +8128,7 @@ redef class ARangeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -8152,25 +8152,25 @@ redef class ARangeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ACrangeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class ACrangeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -8190,7 +8190,7 @@ redef class ACrangeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -8214,25 +8214,25 @@ redef class ACrangeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AOrangeExpr
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 end
 redef class AOrangeExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_expr2=(n)
+    redef fun n_expr2=(n)

     do
         _n_expr2 = n
        n.parent = self
     do
         _n_expr2 = n
        n.parent = self

@@ -8252,7 +8252,7 @@ redef class AOrangeExpr
        n_expr2.parent = self
     end
 
        n_expr2.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -8276,13 +8276,13 @@ redef class AOrangeExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_expr2)
     do
         v.visit(_n_expr)
         v.visit(_n_expr2)

@@ -8304,7 +8304,7 @@ redef class AArrayExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_exprs.length[ do
             if _n_exprs[i] == old_child then
     do
         for i in [0.._n_exprs.length[ do
             if _n_exprs[i] == old_child then

@@ -8320,14 +8320,14 @@ redef class AArrayExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_exprs do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_exprs do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_exprs.length
     do
        do
            var i = _n_exprs.length

@@ -8339,7 +8339,7 @@ redef class AArrayExpr
     end
 end
 redef class ASelfExpr
     end
 end
 redef class ASelfExpr

-    redef meth n_kwself=(n)
+    redef fun n_kwself=(n)

     do
         _n_kwself = n
        n.parent = self
     do
         _n_kwself = n
        n.parent = self

@@ -8356,7 +8356,7 @@ redef class ASelfExpr
        n_kwself.parent = self
     end
 
        n_kwself.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwself == old_child then
             if new_child != null then
     do
         if _n_kwself == old_child then
             if new_child != null then

@@ -8370,12 +8370,12 @@ redef class ASelfExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwself)
     end
 
     do
         v.visit(_n_kwself)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwself)
     end
     do
         v.visit(_n_kwself)
     end

@@ -8389,20 +8389,20 @@ redef class AImplicitSelfExpr
         empty_init
     end
 
         empty_init
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
     end
 
     do
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
     end
 
     do
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
     end
 end
 redef class ATrueExpr
     do
     end
 end
 redef class ATrueExpr

-    redef meth n_kwtrue=(n)
+    redef fun n_kwtrue=(n)

     do
         _n_kwtrue = n
        n.parent = self
     do
         _n_kwtrue = n
        n.parent = self

@@ -8419,7 +8419,7 @@ redef class ATrueExpr
        n_kwtrue.parent = self
     end
 
        n_kwtrue.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwtrue == old_child then
             if new_child != null then
     do
         if _n_kwtrue == old_child then
             if new_child != null then

@@ -8433,18 +8433,18 @@ redef class ATrueExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwtrue)
     end
 
     do
         v.visit(_n_kwtrue)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwtrue)
     end
 end
 redef class AFalseExpr
     do
         v.visit(_n_kwtrue)
     end
 end
 redef class AFalseExpr

-    redef meth n_kwfalse=(n)
+    redef fun n_kwfalse=(n)

     do
         _n_kwfalse = n
        n.parent = self
     do
         _n_kwfalse = n
        n.parent = self

@@ -8461,7 +8461,7 @@ redef class AFalseExpr
        n_kwfalse.parent = self
     end
 
        n_kwfalse.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwfalse == old_child then
             if new_child != null then
     do
         if _n_kwfalse == old_child then
             if new_child != null then

@@ -8475,18 +8475,18 @@ redef class AFalseExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwfalse)
     end
 
     do
         v.visit(_n_kwfalse)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwfalse)
     end
 end
 redef class ANullExpr
     do
         v.visit(_n_kwfalse)
     end
 end
 redef class ANullExpr

-    redef meth n_kwnull=(n)
+    redef fun n_kwnull=(n)

     do
         _n_kwnull = n
        n.parent = self
     do
         _n_kwnull = n
        n.parent = self

@@ -8503,7 +8503,7 @@ redef class ANullExpr
        n_kwnull.parent = self
     end
 
        n_kwnull.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwnull == old_child then
             if new_child != null then
     do
         if _n_kwnull == old_child then
             if new_child != null then

@@ -8517,18 +8517,18 @@ redef class ANullExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwnull)
     end
 
     do
         v.visit(_n_kwnull)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwnull)
     end
 end
 redef class AIntExpr
     do
         v.visit(_n_kwnull)
     end
 end
 redef class AIntExpr

-    redef meth n_number=(n)
+    redef fun n_number=(n)

     do
         _n_number = n
        n.parent = self
     do
         _n_number = n
        n.parent = self

@@ -8545,7 +8545,7 @@ redef class AIntExpr
        n_number.parent = self
     end
 
        n_number.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_number == old_child then
             if new_child != null then
     do
         if _n_number == old_child then
             if new_child != null then

@@ -8559,18 +8559,18 @@ redef class AIntExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_number)
     end
 
     do
         v.visit(_n_number)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_number)
     end
 end
 redef class AFloatExpr
     do
         v.visit(_n_number)
     end
 end
 redef class AFloatExpr

-    redef meth n_float=(n)
+    redef fun n_float=(n)

     do
         _n_float = n
        n.parent = self
     do
         _n_float = n
        n.parent = self

@@ -8587,7 +8587,7 @@ redef class AFloatExpr
        n_float.parent = self
     end
 
        n_float.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_float == old_child then
             if new_child != null then
     do
         if _n_float == old_child then
             if new_child != null then

@@ -8601,18 +8601,18 @@ redef class AFloatExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_float)
     end
 
     do
         v.visit(_n_float)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_float)
     end
 end
 redef class ACharExpr
     do
         v.visit(_n_float)
     end
 end
 redef class ACharExpr

-    redef meth n_char=(n)
+    redef fun n_char=(n)

     do
         _n_char = n
        n.parent = self
     do
         _n_char = n
        n.parent = self

@@ -8629,7 +8629,7 @@ redef class ACharExpr
        n_char.parent = self
     end
 
        n_char.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_char == old_child then
             if new_child != null then
     do
         if _n_char == old_child then
             if new_child != null then

@@ -8643,18 +8643,18 @@ redef class ACharExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_char)
     end
 
     do
         v.visit(_n_char)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_char)
     end
 end
 redef class AStringExpr
     do
         v.visit(_n_char)
     end
 end
 redef class AStringExpr

-    redef meth n_string=(n)
+    redef fun n_string=(n)

     do
         _n_string = n
        n.parent = self
     do
         _n_string = n
        n.parent = self

@@ -8671,7 +8671,7 @@ redef class AStringExpr
        n_string.parent = self
     end
 
        n_string.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_string == old_child then
             if new_child != null then
     do
         if _n_string == old_child then
             if new_child != null then

@@ -8685,18 +8685,18 @@ redef class AStringExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_string)
     end
 
     do
         v.visit(_n_string)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_string)
     end
 end
 redef class AStartStringExpr
     do
         v.visit(_n_string)
     end
 end
 redef class AStartStringExpr

-    redef meth n_string=(n)
+    redef fun n_string=(n)

     do
         _n_string = n
        n.parent = self
     do
         _n_string = n
        n.parent = self

@@ -8713,7 +8713,7 @@ redef class AStartStringExpr
        n_string.parent = self
     end
 
        n_string.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_string == old_child then
             if new_child != null then
     do
         if _n_string == old_child then
             if new_child != null then

@@ -8727,18 +8727,18 @@ redef class AStartStringExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_string)
     end
 
     do
         v.visit(_n_string)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_string)
     end
 end
 redef class AMidStringExpr
     do
         v.visit(_n_string)
     end
 end
 redef class AMidStringExpr

-    redef meth n_string=(n)
+    redef fun n_string=(n)

     do
         _n_string = n
        n.parent = self
     do
         _n_string = n
        n.parent = self

@@ -8755,7 +8755,7 @@ redef class AMidStringExpr
        n_string.parent = self
     end
 
        n_string.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_string == old_child then
             if new_child != null then
     do
         if _n_string == old_child then
             if new_child != null then

@@ -8769,18 +8769,18 @@ redef class AMidStringExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_string)
     end
 
     do
         v.visit(_n_string)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_string)
     end
 end
 redef class AEndStringExpr
     do
         v.visit(_n_string)
     end
 end
 redef class AEndStringExpr

-    redef meth n_string=(n)
+    redef fun n_string=(n)

     do
         _n_string = n
        n.parent = self
     do
         _n_string = n
        n.parent = self

@@ -8797,7 +8797,7 @@ redef class AEndStringExpr
        n_string.parent = self
     end
 
        n_string.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_string == old_child then
             if new_child != null then
     do
         if _n_string == old_child then
             if new_child != null then

@@ -8811,12 +8811,12 @@ redef class AEndStringExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_string)
     end
 
     do
         v.visit(_n_string)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_string)
     end
     do
         v.visit(_n_string)
     end

@@ -8837,7 +8837,7 @@ redef class ASuperstringExpr
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_exprs.length[ do
             if _n_exprs[i] == old_child then
     do
         for i in [0.._n_exprs.length[ do
             if _n_exprs[i] == old_child then

@@ -8853,14 +8853,14 @@ redef class ASuperstringExpr
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_exprs do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_exprs do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_exprs.length
     do
        do
            var i = _n_exprs.length

@@ -8872,7 +8872,7 @@ redef class ASuperstringExpr
     end
 end
 redef class AParExpr
     end
 end
 redef class AParExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     do
         _n_expr = n
        n.parent = self

@@ -8889,7 +8889,7 @@ redef class AParExpr
        n_expr.parent = self
     end
 
        n_expr.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -8903,28 +8903,28 @@ redef class AParExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
     end
 
     do
         v.visit(_n_expr)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
     end
 end
 redef class AAsCastExpr
     do
         v.visit(_n_expr)
     end
 end
 redef class AAsCastExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwas=(n)
+    redef fun n_kwas=(n)

     do
         _n_kwas = n
        n.parent = self
     end
     do
         _n_kwas = n
        n.parent = self
     end

-    redef meth n_type=(n)
+    redef fun n_type=(n)

     do
         _n_type = n
        n.parent = self
     do
         _n_type = n
        n.parent = self

@@ -8947,7 +8947,7 @@ redef class AAsCastExpr
        n_type.parent = self
     end
 
        n_type.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -8981,14 +8981,14 @@ redef class AAsCastExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwas)
         v.visit(_n_type)
     end
 
     do
         v.visit(_n_expr)
         v.visit(_n_kwas)
         v.visit(_n_type)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwas)
     do
         v.visit(_n_expr)
         v.visit(_n_kwas)

@@ -8996,22 +8996,22 @@ redef class AAsCastExpr
     end
 end
 redef class AAsNotnullExpr
     end
 end
 redef class AAsNotnullExpr

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_kwas=(n)
+    redef fun n_kwas=(n)

     do
         _n_kwas = n
        n.parent = self
     end
     do
         _n_kwas = n
        n.parent = self
     end

-    redef meth n_kwnot=(n)
+    redef fun n_kwnot=(n)

     do
         _n_kwnot = n
        n.parent = self
     end
     do
         _n_kwnot = n
        n.parent = self
     end

-    redef meth n_kwnull=(n)
+    redef fun n_kwnull=(n)

     do
         _n_kwnull = n
        n.parent = self
     do
         _n_kwnull = n
        n.parent = self

@@ -9037,7 +9037,7 @@ redef class AAsNotnullExpr
        n_kwnull.parent = self
     end
 
        n_kwnull.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_expr == old_child then
             if new_child != null then
     do
         if _n_expr == old_child then
             if new_child != null then

@@ -9081,7 +9081,7 @@ redef class AAsNotnullExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwas)
     do
         v.visit(_n_expr)
         v.visit(_n_kwas)

@@ -9089,7 +9089,7 @@ redef class AAsNotnullExpr
         v.visit(_n_kwnull)
     end
 
         v.visit(_n_kwnull)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_expr)
         v.visit(_n_kwas)
     do
         v.visit(_n_expr)
         v.visit(_n_kwas)

@@ -9098,17 +9098,17 @@ redef class AAsNotnullExpr
     end
 end
 redef class AIssetAttrExpr
     end
 end
 redef class AIssetAttrExpr

-    redef meth n_kwisset=(n)
+    redef fun n_kwisset=(n)

     do
         _n_kwisset = n
        n.parent = self
     end
     do
         _n_kwisset = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
        n.parent = self
     end
     do
         _n_expr = n
        n.parent = self
     end

-    redef meth n_id=(n)
+    redef fun n_id=(n)

     do
         _n_id = n
        n.parent = self
     do
         _n_id = n
        n.parent = self

@@ -9131,7 +9131,7 @@ redef class AIssetAttrExpr
        n_id.parent = self
     end
 
        n_id.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwisset == old_child then
             if new_child != null then
     do
         if _n_kwisset == old_child then
             if new_child != null then

@@ -9165,14 +9165,14 @@ redef class AIssetAttrExpr
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwisset)
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 
     do
         v.visit(_n_kwisset)
         v.visit(_n_expr)
         v.visit(_n_id)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwisset)
         v.visit(_n_expr)
     do
         v.visit(_n_kwisset)
         v.visit(_n_expr)

@@ -9180,7 +9180,7 @@ redef class AIssetAttrExpr
     end
 end
 redef class APlusAssignOp
     end
 end
 redef class APlusAssignOp

-    redef meth n_pluseq=(n)
+    redef fun n_pluseq=(n)

     do
         _n_pluseq = n
        n.parent = self
     do
         _n_pluseq = n
        n.parent = self

@@ -9197,7 +9197,7 @@ redef class APlusAssignOp
        n_pluseq.parent = self
     end
 
        n_pluseq.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_pluseq == old_child then
             if new_child != null then
     do
         if _n_pluseq == old_child then
             if new_child != null then

@@ -9211,18 +9211,18 @@ redef class APlusAssignOp
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_pluseq)
     end
 
     do
         v.visit(_n_pluseq)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_pluseq)
     end
 end
 redef class AMinusAssignOp
     do
         v.visit(_n_pluseq)
     end
 end
 redef class AMinusAssignOp

-    redef meth n_minuseq=(n)
+    redef fun n_minuseq=(n)

     do
         _n_minuseq = n
        n.parent = self
     do
         _n_minuseq = n
        n.parent = self

@@ -9239,7 +9239,7 @@ redef class AMinusAssignOp
        n_minuseq.parent = self
     end
 
        n_minuseq.parent = self
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_minuseq == old_child then
             if new_child != null then
     do
         if _n_minuseq == old_child then
             if new_child != null then

@@ -9253,28 +9253,28 @@ redef class AMinusAssignOp
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_minuseq)
     end
 
     do
         v.visit(_n_minuseq)
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_minuseq)
     end
 end
 redef class AClosureDef
     do
         v.visit(_n_minuseq)
     end
 end
 redef class AClosureDef

-    redef meth n_kwwith=(n)
+    redef fun n_kwwith=(n)

     do
         _n_kwwith = n
        n.parent = self
     end
     do
         _n_kwwith = n
        n.parent = self
     end

-    redef meth n_kwdo=(n)
+    redef fun n_kwdo=(n)

     do
         _n_kwdo = n
        n.parent = self
     end
     do
         _n_kwdo = n
        n.parent = self
     end

-    redef meth n_expr=(n)
+    redef fun n_expr=(n)

     do
         _n_expr = n
         if n != null then
     do
         _n_expr = n
         if n != null then

@@ -9307,7 +9307,7 @@ redef class AClosureDef
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_kwwith == old_child then
             if new_child != null then
     do
         if _n_kwwith == old_child then
             if new_child != null then

@@ -9353,7 +9353,7 @@ redef class AClosureDef
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         v.visit(_n_kwwith)
             for n in _n_id do
     do
         v.visit(_n_kwwith)
             for n in _n_id do

@@ -9365,7 +9365,7 @@ redef class AClosureDef
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         v.visit(_n_kwwith)
        do
     do
         v.visit(_n_kwwith)
        do

@@ -9382,7 +9382,7 @@ redef class AClosureDef
     end
 end
 redef class AQualified
     end
 end
 redef class AQualified

-    redef meth n_classid=(n)
+    redef fun n_classid=(n)

     do
         _n_classid = n
         if n != null then
     do
         _n_classid = n
         if n != null then

@@ -9409,7 +9409,7 @@ redef class AQualified
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_id.length[ do
             if _n_id[i] == old_child then
     do
         for i in [0.._n_id.length[ do
             if _n_id[i] == old_child then

@@ -9435,7 +9435,7 @@ redef class AQualified
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_id do
                 v.visit(n)
     do
             for n in _n_id do
                 v.visit(n)

@@ -9445,7 +9445,7 @@ redef class AQualified
         end
     end
 
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_id.length
     do
        do
            var i = _n_id.length

@@ -9475,7 +9475,7 @@ redef class ADoc
        end
     end
 
        end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         for i in [0.._n_comment.length[ do
             if _n_comment[i] == old_child then
     do
         for i in [0.._n_comment.length[ do
             if _n_comment[i] == old_child then

@@ -9491,14 +9491,14 @@ redef class ADoc
         end
     end
 
         end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
             for n in _n_comment do
                 v.visit(n)
            end
     end
 
     do
             for n in _n_comment do
                 v.visit(n)
            end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
        do
            var i = _n_comment.length
     do
        do
            var i = _n_comment.length

@@ -9519,7 +9519,7 @@ redef class Start
         _n_eof = n_eof
     end
 
         _n_eof = n_eof
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_base == old_child then
             if new_child == null then
     do
         if _n_base == old_child then
             if new_child == null then

@@ -9533,14 +9533,14 @@ redef class Start
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
         end
     end
 
     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
     do
         if _n_base != null then
             v.visit(_n_base.as(not null))

diff --git a/src/parser/parser_tables.nit b/src/parser/parser_tables.nit
index f1c6b59..6ad253b 100644 (file)
--- a/src/parser/parser_tables.nit
+++ b/src/parser/parser_tables.nit
@@ -4,8 +4,8 @@ package parser_tables
 
 # Parser that build a full AST
 abstract class ParserTable
 
 # Parser that build a full AST
 abstract class ParserTable

-       attr _action_table: Array[Array[Int]]
-       private meth build_action_table
+       var _action_table: Array[Array[Int]]
+       private fun build_action_table

        do
                _action_table = once [ 
                        action_table_row1,
        do
                _action_table = once [ 
                        action_table_row1,

@@ -1523,7 +1523,7 @@ abstract class ParserTable
                ]
        end
 
                ]
        end
 

-       private meth action_table_row1: Array[Int]
+       private fun action_table_row1: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1532,26 +1532,26 @@ abstract class ParserTable
                                86, 1, 0 
                        ]
        end
                                86, 1, 0 
                        ]
        end

-       private meth action_table_row2: Array[Int]
+       private fun action_table_row2: Array[Int]

        do
                return [
                                -1, 1, 734 
                        ]
        end
        do
                return [
                                -1, 1, 734 
                        ]
        end

-       private meth action_table_row3: Array[Int]
+       private fun action_table_row3: Array[Int]

        do
                return [
                                -1, 1, 732 
                        ]
        end
        do
                return [
                                -1, 1, 732 
                        ]
        end

-       private meth action_table_row4: Array[Int]
+       private fun action_table_row4: Array[Int]

        do
                return [
                                -1, 3, 3 ,
                                86, 2, -1 
                        ]
        end
        do
                return [
                                -1, 3, 3 ,
                                86, 2, -1 
                        ]
        end

-       private meth action_table_row5: Array[Int]
+       private fun action_table_row5: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1560,38 +1560,38 @@ abstract class ParserTable
                                86, 1, 1 
                        ]
        end
                                86, 1, 1 
                        ]
        end

-       private meth action_table_row6: Array[Int]
+       private fun action_table_row6: Array[Int]

        do
                return [
                                -1, 1, 708 
                        ]
        end
        do
                return [
                                -1, 1, 708 
                        ]
        end

-       private meth action_table_row7: Array[Int]
+       private fun action_table_row7: Array[Int]

        do
                return [
                                -1, 1, 24 
                        ]
        end
        do
                return [
                                -1, 1, 24 
                        ]
        end

-       private meth action_table_row8: Array[Int]
+       private fun action_table_row8: Array[Int]

        do
                return [
                                -1, 1, 51 
                        ]
        end
        do
                return [
                                -1, 1, 51 
                        ]
        end

-       private meth action_table_row9: Array[Int]
+       private fun action_table_row9: Array[Int]

        do
                return [
                                -1, 1, 710 
                        ]
        end
        do
                return [
                                -1, 1, 710 
                        ]
        end

-       private meth action_table_row10: Array[Int]
+       private fun action_table_row10: Array[Int]

        do
                return [
                                -1, 1, 468 ,
                                86, 1, 52 
                        ]
        end
        do
                return [
                                -1, 1, 468 ,
                                86, 1, 52 
                        ]
        end

-       private meth action_table_row11: Array[Int]
+       private fun action_table_row11: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -1629,14 +1629,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row12: Array[Int]
+       private fun action_table_row12: Array[Int]

        do
                return [
                                -1, 1, 466 ,
                                1, 0, 2 
                        ]
        end
        do
                return [
                                -1, 1, 466 ,
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row13: Array[Int]
+       private fun action_table_row13: Array[Int]

        do
                return [
                                -1, 3, 12 ,
        do
                return [
                                -1, 3, 12 ,

@@ -1644,7 +1644,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row14: Array[Int]
+       private fun action_table_row14: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1653,7 +1653,7 @@ abstract class ParserTable
                                86, 1, 2 
                        ]
        end
                                86, 1, 2 
                        ]
        end

-       private meth action_table_row15: Array[Int]
+       private fun action_table_row15: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1662,7 +1662,7 @@ abstract class ParserTable
                                86, 1, 4 
                        ]
        end
                                86, 1, 4 
                        ]
        end

-       private meth action_table_row16: Array[Int]
+       private fun action_table_row16: Array[Int]

        do
                return [
                                -1, 1, 464 ,
        do
                return [
                                -1, 1, 464 ,

@@ -1670,20 +1670,20 @@ abstract class ParserTable
                                1, 0, 84 
                        ]
        end
                                1, 0, 84 
                        ]
        end

-       private meth action_table_row17: Array[Int]
+       private fun action_table_row17: Array[Int]

        do
                return [
                                -1, 1, 471 ,
                                0, 0, 86 
                        ]
        end
        do
                return [
                                -1, 1, 471 ,
                                0, 0, 86 
                        ]
        end

-       private meth action_table_row18: Array[Int]
+       private fun action_table_row18: Array[Int]

        do
                return [
                                -1, 1, 25 
                        ]
        end
        do
                return [
                                -1, 1, 25 
                        ]
        end

-       private meth action_table_row19: Array[Int]
+       private fun action_table_row19: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -1720,7 +1720,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row20: Array[Int]
+       private fun action_table_row20: Array[Int]

        do
                return [
                                -1, 3, 19 ,
        do
                return [
                                -1, 3, 19 ,

@@ -1728,7 +1728,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row21: Array[Int]
+       private fun action_table_row21: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1737,7 +1737,7 @@ abstract class ParserTable
                                86, 1, 3 
                        ]
        end
                                86, 1, 3 
                        ]
        end

-       private meth action_table_row22: Array[Int]
+       private fun action_table_row22: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1746,7 +1746,7 @@ abstract class ParserTable
                                86, 1, 5 
                        ]
        end
                                86, 1, 5 
                        ]
        end

-       private meth action_table_row23: Array[Int]
+       private fun action_table_row23: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1754,7 +1754,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row24: Array[Int]
+       private fun action_table_row24: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -1783,7 +1783,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row25: Array[Int]
+       private fun action_table_row25: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -1792,7 +1792,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row26: Array[Int]
+       private fun action_table_row26: Array[Int]

        do
                return [
                                -1, 3, 25 ,
        do
                return [
                                -1, 3, 25 ,

@@ -1828,14 +1828,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row27: Array[Int]
+       private fun action_table_row27: Array[Int]

        do
                return [
                                -1, 3, 26 ,
                                77, 0, 132 
                        ]
        end
        do
                return [
                                -1, 3, 26 ,
                                77, 0, 132 
                        ]
        end

-       private meth action_table_row28: Array[Int]
+       private fun action_table_row28: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1843,7 +1843,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row29: Array[Int]
+       private fun action_table_row29: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1851,7 +1851,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row30: Array[Int]
+       private fun action_table_row30: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1859,7 +1859,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row31: Array[Int]
+       private fun action_table_row31: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1867,7 +1867,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row32: Array[Int]
+       private fun action_table_row32: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1875,7 +1875,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row33: Array[Int]
+       private fun action_table_row33: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -1883,7 +1883,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row34: Array[Int]
+       private fun action_table_row34: Array[Int]

        do
                return [
                                -1, 1, 316 ,
        do
                return [
                                -1, 1, 316 ,

@@ -1911,7 +1911,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row35: Array[Int]
+       private fun action_table_row35: Array[Int]

        do
                return [
                                -1, 1, 321 ,
        do
                return [
                                -1, 1, 321 ,

@@ -1939,7 +1939,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row36: Array[Int]
+       private fun action_table_row36: Array[Int]

        do
                return [
                                -1, 1, 318 ,
        do
                return [
                                -1, 1, 318 ,

@@ -1967,13 +1967,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row37: Array[Int]
+       private fun action_table_row37: Array[Int]

        do
                return [
                                -1, 1, 320 
                        ]
        end
        do
                return [
                                -1, 1, 320 
                        ]
        end

-       private meth action_table_row38: Array[Int]
+       private fun action_table_row38: Array[Int]

        do
                return [
                                -1, 3, 37 ,
        do
                return [
                                -1, 3, 37 ,

@@ -2001,7 +2001,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row39: Array[Int]
+       private fun action_table_row39: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2009,7 +2009,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row40: Array[Int]
+       private fun action_table_row40: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -2038,31 +2038,31 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row41: Array[Int]
+       private fun action_table_row41: Array[Int]

        do
                return [
                                -1, 1, 424 
                        ]
        end
        do
                return [
                                -1, 1, 424 
                        ]
        end

-       private meth action_table_row42: Array[Int]
+       private fun action_table_row42: Array[Int]

        do
                return [
                                -1, 1, 425 
                        ]
        end
        do
                return [
                                -1, 1, 425 
                        ]
        end

-       private meth action_table_row43: Array[Int]
+       private fun action_table_row43: Array[Int]

        do
                return [
                                -1, 1, 426 
                        ]
        end
        do
                return [
                                -1, 1, 426 
                        ]
        end

-       private meth action_table_row44: Array[Int]
+       private fun action_table_row44: Array[Int]

        do
                return [
                                -1, 1, 427 
                        ]
        end
        do
                return [
                                -1, 1, 427 
                        ]
        end

-       private meth action_table_row45: Array[Int]
+       private fun action_table_row45: Array[Int]

        do
                return [
                                -1, 3, 44 ,
        do
                return [
                                -1, 3, 44 ,

@@ -2090,7 +2090,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row46: Array[Int]
+       private fun action_table_row46: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2098,14 +2098,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row47: Array[Int]
+       private fun action_table_row47: Array[Int]

        do
                return [
                                -1, 3, 46 ,
                                57, 0, 172 
                        ]
        end
        do
                return [
                                -1, 3, 46 ,
                                57, 0, 172 
                        ]
        end

-       private meth action_table_row48: Array[Int]
+       private fun action_table_row48: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -2138,7 +2138,7 @@ abstract class ParserTable
                                86, 1, 451 
                        ]
        end
                                86, 1, 451 
                        ]
        end

-       private meth action_table_row49: Array[Int]
+       private fun action_table_row49: Array[Int]

        do
                return [
                                -1, 1, 412 ,
        do
                return [
                                -1, 1, 412 ,

@@ -2147,37 +2147,37 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row50: Array[Int]
+       private fun action_table_row50: Array[Int]

        do
                return [
                                -1, 1, 428 
                        ]
        end
        do
                return [
                                -1, 1, 428 
                        ]
        end

-       private meth action_table_row51: Array[Int]
+       private fun action_table_row51: Array[Int]

        do
                return [
                                -1, 1, 429 
                        ]
        end
        do
                return [
                                -1, 1, 429 
                        ]
        end

-       private meth action_table_row52: Array[Int]
+       private fun action_table_row52: Array[Int]

        do
                return [
                                -1, 1, 430 
                        ]
        end
        do
                return [
                                -1, 1, 430 
                        ]
        end

-       private meth action_table_row53: Array[Int]
+       private fun action_table_row53: Array[Int]

        do
                return [
                                -1, 1, 431 
                        ]
        end
        do
                return [
                                -1, 1, 431 
                        ]
        end

-       private meth action_table_row54: Array[Int]
+       private fun action_table_row54: Array[Int]

        do
                return [
                                -1, 1, 439 
                        ]
        end
        do
                return [
                                -1, 1, 439 
                        ]
        end

-       private meth action_table_row55: Array[Int]
+       private fun action_table_row55: Array[Int]

        do
                return [
                                -1, 3, 54 ,
        do
                return [
                                -1, 3, 54 ,

@@ -2189,7 +2189,7 @@ abstract class ParserTable
                                10, 0, 185 
                        ]
        end
                                10, 0, 185 
                        ]
        end

-       private meth action_table_row56: Array[Int]
+       private fun action_table_row56: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2197,49 +2197,49 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row57: Array[Int]
+       private fun action_table_row57: Array[Int]

        do
                return [
                                -1, 1, 314 
                        ]
        end
        do
                return [
                                -1, 1, 314 
                        ]
        end

-       private meth action_table_row58: Array[Int]
+       private fun action_table_row58: Array[Int]

        do
                return [
                                -1, 1, 315 
                        ]
        end
        do
                return [
                                -1, 1, 315 
                        ]
        end

-       private meth action_table_row59: Array[Int]
+       private fun action_table_row59: Array[Int]

        do
                return [
                                -1, 1, 323 
                        ]
        end
        do
                return [
                                -1, 1, 323 
                        ]
        end

-       private meth action_table_row60: Array[Int]
+       private fun action_table_row60: Array[Int]

        do
                return [
                                -1, 1, 324 
                        ]
        end
        do
                return [
                                -1, 1, 324 
                        ]
        end

-       private meth action_table_row61: Array[Int]
+       private fun action_table_row61: Array[Int]

        do
                return [
                                -1, 1, 325 
                        ]
        end
        do
                return [
                                -1, 1, 325 
                        ]
        end

-       private meth action_table_row62: Array[Int]
+       private fun action_table_row62: Array[Int]

        do
                return [
                                -1, 1, 326 
                        ]
        end
        do
                return [
                                -1, 1, 326 
                        ]
        end

-       private meth action_table_row63: Array[Int]
+       private fun action_table_row63: Array[Int]

        do
                return [
                                -1, 1, 327 
                        ]
        end
        do
                return [
                                -1, 1, 327 
                        ]
        end

-       private meth action_table_row64: Array[Int]
+       private fun action_table_row64: Array[Int]

        do
                return [
                                -1, 3, 63 ,
        do
                return [
                                -1, 3, 63 ,

@@ -2247,13 +2247,13 @@ abstract class ParserTable
                                63, 0, 192 
                        ]
        end
                                63, 0, 192 
                        ]
        end

-       private meth action_table_row65: Array[Int]
+       private fun action_table_row65: Array[Int]

        do
                return [
                                -1, 1, 432 
                        ]
        end
        do
                return [
                                -1, 1, 432 
                        ]
        end

-       private meth action_table_row66: Array[Int]
+       private fun action_table_row66: Array[Int]

        do
                return [
                                -1, 3, 65 ,
        do
                return [
                                -1, 3, 65 ,

@@ -2261,7 +2261,7 @@ abstract class ParserTable
                                85, 0, 195 
                        ]
        end
                                85, 0, 195 
                        ]
        end

-       private meth action_table_row67: Array[Int]
+       private fun action_table_row67: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2269,32 +2269,32 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row68: Array[Int]
+       private fun action_table_row68: Array[Int]

        do
                return [
                                -1, 1, 423 
                        ]
        end
        do
                return [
                                -1, 1, 423 
                        ]
        end

-       private meth action_table_row69: Array[Int]
+       private fun action_table_row69: Array[Int]

        do
                return [
                                -1, 3, 68 ,
                                42, 0, 201 
                        ]
        end
        do
                return [
                                -1, 3, 68 ,
                                42, 0, 201 
                        ]
        end

-       private meth action_table_row70: Array[Int]
+       private fun action_table_row70: Array[Int]

        do
                return [
                                -1, 1, 730 
                        ]
        end
        do
                return [
                                -1, 1, 730 
                        ]
        end

-       private meth action_table_row71: Array[Int]
+       private fun action_table_row71: Array[Int]

        do
                return [
                                -1, 1, 457 
                        ]
        end
        do
                return [
                                -1, 1, 457 
                        ]
        end

-       private meth action_table_row72: Array[Int]
+       private fun action_table_row72: Array[Int]

        do
                return [
                                -1, 1, 459 ,
        do
                return [
                                -1, 1, 459 ,

@@ -2302,7 +2302,7 @@ abstract class ParserTable
                                77, 0, 202 
                        ]
        end
                                77, 0, 202 
                        ]
        end

-       private meth action_table_row73: Array[Int]
+       private fun action_table_row73: Array[Int]

        do
                return [
                                -1, 1, 465 ,
        do
                return [
                                -1, 1, 465 ,

@@ -2310,19 +2310,19 @@ abstract class ParserTable
                                1, 0, 84 
                        ]
        end
                                1, 0, 84 
                        ]
        end

-       private meth action_table_row74: Array[Int]
+       private fun action_table_row74: Array[Int]

        do
                return [
                                -1, 1, 463 
                        ]
        end
        do
                return [
                                -1, 1, 463 
                        ]
        end

-       private meth action_table_row75: Array[Int]
+       private fun action_table_row75: Array[Int]

        do
                return [
                                -1, 1, 462 
                        ]
        end
        do
                return [
                                -1, 1, 462 
                        ]
        end

-       private meth action_table_row76: Array[Int]
+       private fun action_table_row76: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2331,19 +2331,19 @@ abstract class ParserTable
                                86, 1, 8 
                        ]
        end
                                86, 1, 8 
                        ]
        end

-       private meth action_table_row77: Array[Int]
+       private fun action_table_row77: Array[Int]

        do
                return [
                                -1, 1, 709 
                        ]
        end
        do
                return [
                                -1, 1, 709 
                        ]
        end

-       private meth action_table_row78: Array[Int]
+       private fun action_table_row78: Array[Int]

        do
                return [
                                -1, 1, 26 
                        ]
        end
        do
                return [
                                -1, 1, 26 
                        ]
        end

-       private meth action_table_row79: Array[Int]
+       private fun action_table_row79: Array[Int]

        do
                return [
                                -1, 3, 78 ,
        do
                return [
                                -1, 3, 78 ,

@@ -2351,7 +2351,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row80: Array[Int]
+       private fun action_table_row80: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2360,19 +2360,19 @@ abstract class ParserTable
                                86, 1, 6 
                        ]
        end
                                86, 1, 6 
                        ]
        end

-       private meth action_table_row81: Array[Int]
+       private fun action_table_row81: Array[Int]

        do
                return [
                                -1, 1, 28 
                        ]
        end
        do
                return [
                                -1, 1, 28 
                        ]
        end

-       private meth action_table_row82: Array[Int]
+       private fun action_table_row82: Array[Int]

        do
                return [
                                -1, 1, 711 
                        ]
        end
        do
                return [
                                -1, 1, 711 
                        ]
        end

-       private meth action_table_row83: Array[Int]
+       private fun action_table_row83: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -2409,7 +2409,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row84: Array[Int]
+       private fun action_table_row84: Array[Int]

        do
                return [
                                -1, 3, 83 ,
        do
                return [
                                -1, 3, 83 ,

@@ -2417,26 +2417,26 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row85: Array[Int]
+       private fun action_table_row85: Array[Int]

        do
                return [
                                -1, 1, 733 
                        ]
        end
        do
                return [
                                -1, 1, 733 
                        ]
        end

-       private meth action_table_row86: Array[Int]
+       private fun action_table_row86: Array[Int]

        do
                return [
                                -1, 1, 469 ,
                                0, 0, 86 
                        ]
        end
        do
                return [
                                -1, 1, 469 ,
                                0, 0, 86 
                        ]
        end

-       private meth action_table_row87: Array[Int]
+       private fun action_table_row87: Array[Int]

        do
                return [
                                -1, 1, 735 
                        ]
        end
        do
                return [
                                -1, 1, 735 
                        ]
        end

-       private meth action_table_row88: Array[Int]
+       private fun action_table_row88: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2445,13 +2445,13 @@ abstract class ParserTable
                                86, 1, 10 
                        ]
        end
                                86, 1, 10 
                        ]
        end

-       private meth action_table_row89: Array[Int]
+       private fun action_table_row89: Array[Int]

        do
                return [
                                -1, 1, 27 
                        ]
        end
        do
                return [
                                -1, 1, 27 
                        ]
        end

-       private meth action_table_row90: Array[Int]
+       private fun action_table_row90: Array[Int]

        do
                return [
                                -1, 3, 89 ,
        do
                return [
                                -1, 3, 89 ,

@@ -2459,7 +2459,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row91: Array[Int]
+       private fun action_table_row91: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2468,13 +2468,13 @@ abstract class ParserTable
                                86, 1, 7 
                        ]
        end
                                86, 1, 7 
                        ]
        end

-       private meth action_table_row92: Array[Int]
+       private fun action_table_row92: Array[Int]

        do
                return [
                                -1, 1, 29 
                        ]
        end
        do
                return [
                                -1, 1, 29 
                        ]
        end

-       private meth action_table_row93: Array[Int]
+       private fun action_table_row93: Array[Int]

        do
                return [
                                -1, 3, 92 ,
        do
                return [
                                -1, 3, 92 ,

@@ -2482,27 +2482,27 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row94: Array[Int]
+       private fun action_table_row94: Array[Int]

        do
                return [
                                -1, 1, 468 
                        ]
        end
        do
                return [
                                -1, 1, 468 
                        ]
        end

-       private meth action_table_row95: Array[Int]
+       private fun action_table_row95: Array[Int]

        do
                return [
                                -1, 3, 94 ,
                                77, 0, 222 
                        ]
        end
        do
                return [
                                -1, 3, 94 ,
                                77, 0, 222 
                        ]
        end

-       private meth action_table_row96: Array[Int]
+       private fun action_table_row96: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row97: Array[Int]
+       private fun action_table_row97: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2510,7 +2510,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row98: Array[Int]
+       private fun action_table_row98: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2518,7 +2518,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row99: Array[Int]
+       private fun action_table_row99: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2526,7 +2526,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row100: Array[Int]
+       private fun action_table_row100: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2534,38 +2534,38 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row101: Array[Int]
+       private fun action_table_row101: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row102: Array[Int]
+       private fun action_table_row102: Array[Int]

        do
                return [
                                -1, 1, 639 
                        ]
        end
        do
                return [
                                -1, 1, 639 
                        ]
        end

-       private meth action_table_row103: Array[Int]
+       private fun action_table_row103: Array[Int]

        do
                return [
                                -1, 1, 640 
                        ]
        end
        do
                return [
                                -1, 1, 640 
                        ]
        end

-       private meth action_table_row104: Array[Int]
+       private fun action_table_row104: Array[Int]

        do
                return [
                                -1, 1, 641 
                        ]
        end
        do
                return [
                                -1, 1, 641 
                        ]
        end

-       private meth action_table_row105: Array[Int]
+       private fun action_table_row105: Array[Int]

        do
                return [
                                -1, 1, 642 
                        ]
        end
        do
                return [
                                -1, 1, 642 
                        ]
        end

-       private meth action_table_row106: Array[Int]
+       private fun action_table_row106: Array[Int]

        do
                return [
                                -1, 3, 105 ,
        do
                return [
                                -1, 3, 105 ,

@@ -2586,7 +2586,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row107: Array[Int]
+       private fun action_table_row107: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2594,7 +2594,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row108: Array[Int]
+       private fun action_table_row108: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2602,7 +2602,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row109: Array[Int]
+       private fun action_table_row109: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -2610,68 +2610,68 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row110: Array[Int]
+       private fun action_table_row110: Array[Int]

        do
                return [
                                -1, 1, 631 
                        ]
        end
        do
                return [
                                -1, 1, 631 
                        ]
        end

-       private meth action_table_row111: Array[Int]
+       private fun action_table_row111: Array[Int]

        do
                return [
                                -1, 1, 643 
                        ]
        end
        do
                return [
                                -1, 1, 643 
                        ]
        end

-       private meth action_table_row112: Array[Int]
+       private fun action_table_row112: Array[Int]

        do
                return [
                                -1, 1, 644 
                        ]
        end
        do
                return [
                                -1, 1, 644 
                        ]
        end

-       private meth action_table_row113: Array[Int]
+       private fun action_table_row113: Array[Int]

        do
                return [
                                -1, 1, 645 
                        ]
        end
        do
                return [
                                -1, 1, 645 
                        ]
        end

-       private meth action_table_row114: Array[Int]
+       private fun action_table_row114: Array[Int]

        do
                return [
                                -1, 1, 646 
                        ]
        end
        do
                return [
                                -1, 1, 646 
                        ]
        end

-       private meth action_table_row115: Array[Int]
+       private fun action_table_row115: Array[Int]

        do
                return [
                                -1, 1, 647 
                        ]
        end
        do
                return [
                                -1, 1, 647 
                        ]
        end

-       private meth action_table_row116: Array[Int]
+       private fun action_table_row116: Array[Int]

        do
                return [
                                -1, 1, 418 
                        ]
        end
        do
                return [
                                -1, 1, 418 
                        ]
        end

-       private meth action_table_row117: Array[Int]
+       private fun action_table_row117: Array[Int]

        do
                return [
                                -1, 1, 335 
                        ]
        end
        do
                return [
                                -1, 1, 335 
                        ]
        end

-       private meth action_table_row118: Array[Int]
+       private fun action_table_row118: Array[Int]

        do
                return [
                                -1, 3, 117 ,
                                42, 0, 236 
                        ]
        end
        do
                return [
                                -1, 3, 117 ,
                                42, 0, 236 
                        ]
        end

-       private meth action_table_row119: Array[Int]
+       private fun action_table_row119: Array[Int]

        do
                return [
                                -1, 1, 449 
                        ]
        end
        do
                return [
                                -1, 1, 449 
                        ]
        end

-       private meth action_table_row120: Array[Int]
+       private fun action_table_row120: Array[Int]

        do
                return [
                                -1, 1, 599 ,
        do
                return [
                                -1, 1, 599 ,

@@ -2679,19 +2679,19 @@ abstract class ParserTable
                                32, 0, 238 
                        ]
        end
                                32, 0, 238 
                        ]
        end

-       private meth action_table_row121: Array[Int]
+       private fun action_table_row121: Array[Int]

        do
                return [
                                -1, 1, 601 
                        ]
        end
        do
                return [
                                -1, 1, 601 
                        ]
        end

-       private meth action_table_row122: Array[Int]
+       private fun action_table_row122: Array[Int]

        do
                return [
                                -1, 1, 604 
                        ]
        end
        do
                return [
                                -1, 1, 604 
                        ]
        end

-       private meth action_table_row123: Array[Int]
+       private fun action_table_row123: Array[Int]

        do
                return [
                                -1, 1, 606 ,
        do
                return [
                                -1, 1, 606 ,

@@ -2708,7 +2708,7 @@ abstract class ParserTable
                                75, 0, 249 
                        ]
        end
                                75, 0, 249 
                        ]
        end

-       private meth action_table_row124: Array[Int]
+       private fun action_table_row124: Array[Int]

        do
                return [
                                -1, 1, 616 ,
        do
                return [
                                -1, 1, 616 ,

@@ -2717,26 +2717,26 @@ abstract class ParserTable
                                68, 0, 252 
                        ]
        end
                                68, 0, 252 
                        ]
        end

-       private meth action_table_row125: Array[Int]
+       private fun action_table_row125: Array[Int]

        do
                return [
                                -1, 1, 619 
                        ]
        end
        do
                return [
                                -1, 1, 619 
                        ]
        end

-       private meth action_table_row126: Array[Int]
+       private fun action_table_row126: Array[Int]

        do
                return [
                                -1, 1, 623 
                        ]
        end
        do
                return [
                                -1, 1, 623 
                        ]
        end

-       private meth action_table_row127: Array[Int]
+       private fun action_table_row127: Array[Int]

        do
                return [
                                -1, 1, 626 ,
                                63, 0, 253 
                        ]
        end
        do
                return [
                                -1, 1, 626 ,
                                63, 0, 253 
                        ]
        end

-       private meth action_table_row128: Array[Int]
+       private fun action_table_row128: Array[Int]

        do
                return [
                                -1, 3, 127 ,
        do
                return [
                                -1, 3, 127 ,

@@ -2747,25 +2747,25 @@ abstract class ParserTable
                                10, 0, 254 
                        ]
        end
                                10, 0, 254 
                        ]
        end

-       private meth action_table_row129: Array[Int]
+       private fun action_table_row129: Array[Int]

        do
                return [
                                -1, 1, 312 
                        ]
        end
        do
                return [
                                -1, 1, 312 
                        ]
        end

-       private meth action_table_row130: Array[Int]
+       private fun action_table_row130: Array[Int]

        do
                return [
                                -1, 1, 362 
                        ]
        end
        do
                return [
                                -1, 1, 362 
                        ]
        end

-       private meth action_table_row131: Array[Int]
+       private fun action_table_row131: Array[Int]

        do
                return [
                                -1, 1, 308 
                        ]
        end
        do
                return [
                                -1, 1, 308 
                        ]
        end

-       private meth action_table_row132: Array[Int]
+       private fun action_table_row132: Array[Int]

        do
                return [
                                -1, 3, 131 ,
        do
                return [
                                -1, 3, 131 ,

@@ -2799,7 +2799,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row133: Array[Int]
+       private fun action_table_row133: Array[Int]

        do
                return [
                                -1, 1, 346 ,
        do
                return [
                                -1, 1, 346 ,

@@ -2807,25 +2807,25 @@ abstract class ParserTable
                                58, 0, 259 
                        ]
        end
                                58, 0, 259 
                        ]
        end

-       private meth action_table_row134: Array[Int]
+       private fun action_table_row134: Array[Int]

        do
                return [
                                -1, 1, 258 
                        ]
        end
        do
                return [
                                -1, 1, 258 
                        ]
        end

-       private meth action_table_row135: Array[Int]
+       private fun action_table_row135: Array[Int]

        do
                return [
                                -1, 1, 257 
                        ]
        end
        do
                return [
                                -1, 1, 257 
                        ]
        end

-       private meth action_table_row136: Array[Int]
+       private fun action_table_row136: Array[Int]

        do
                return [
                                -1, 1, 259 
                        ]
        end
        do
                return [
                                -1, 1, 259 
                        ]
        end

-       private meth action_table_row137: Array[Int]
+       private fun action_table_row137: Array[Int]

        do
                return [
                                -1, 3, 136 ,
        do
                return [
                                -1, 3, 136 ,

@@ -2853,7 +2853,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row138: Array[Int]
+       private fun action_table_row138: Array[Int]

        do
                return [
                                -1, 3, 137 ,
        do
                return [
                                -1, 3, 137 ,

@@ -2881,21 +2881,21 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row139: Array[Int]
+       private fun action_table_row139: Array[Int]

        do
                return [
                                -1, 3, 138 ,
                                77, 0, 263 
                        ]
        end
        do
                return [
                                -1, 3, 138 ,
                                77, 0, 263 
                        ]
        end

-       private meth action_table_row140: Array[Int]
+       private fun action_table_row140: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row141: Array[Int]
+       private fun action_table_row141: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2903,7 +2903,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row142: Array[Int]
+       private fun action_table_row142: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2911,7 +2911,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row143: Array[Int]
+       private fun action_table_row143: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2919,7 +2919,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row144: Array[Int]
+       private fun action_table_row144: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2927,14 +2927,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row145: Array[Int]
+       private fun action_table_row145: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row146: Array[Int]
+       private fun action_table_row146: Array[Int]

        do
                return [
                                -1, 3, 145 ,
        do
                return [
                                -1, 3, 145 ,

@@ -2957,7 +2957,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row147: Array[Int]
+       private fun action_table_row147: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -2965,7 +2965,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row148: Array[Int]
+       private fun action_table_row148: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -2973,25 +2973,25 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row149: Array[Int]
+       private fun action_table_row149: Array[Int]

        do
                return [
                                -1, 1, 412 
                        ]
        end
        do
                return [
                                -1, 1, 412 
                        ]
        end

-       private meth action_table_row150: Array[Int]
+       private fun action_table_row150: Array[Int]

        do
                return [
                                -1, 1, 317 
                        ]
        end
        do
                return [
                                -1, 1, 317 
                        ]
        end

-       private meth action_table_row151: Array[Int]
+       private fun action_table_row151: Array[Int]

        do
                return [
                                -1, 1, 376 
                        ]
        end
        do
                return [
                                -1, 1, 376 
                        ]
        end

-       private meth action_table_row152: Array[Int]
+       private fun action_table_row152: Array[Int]

        do
                return [
                                -1, 1, 380 ,
        do
                return [
                                -1, 1, 380 ,

@@ -2999,19 +2999,19 @@ abstract class ParserTable
                                32, 0, 273 
                        ]
        end
                                32, 0, 273 
                        ]
        end

-       private meth action_table_row153: Array[Int]
+       private fun action_table_row153: Array[Int]

        do
                return [
                                -1, 1, 382 
                        ]
        end
        do
                return [
                                -1, 1, 382 
                        ]
        end

-       private meth action_table_row154: Array[Int]
+       private fun action_table_row154: Array[Int]

        do
                return [
                                -1, 1, 385 
                        ]
        end
        do
                return [
                                -1, 1, 385 
                        ]
        end

-       private meth action_table_row155: Array[Int]
+       private fun action_table_row155: Array[Int]

        do
                return [
                                -1, 1, 387 ,
        do
                return [
                                -1, 1, 387 ,

@@ -3028,7 +3028,7 @@ abstract class ParserTable
                                75, 0, 284 
                        ]
        end
                                75, 0, 284 
                        ]
        end

-       private meth action_table_row156: Array[Int]
+       private fun action_table_row156: Array[Int]

        do
                return [
                                -1, 1, 397 ,
        do
                return [
                                -1, 1, 397 ,

@@ -3037,19 +3037,19 @@ abstract class ParserTable
                                68, 0, 287 
                        ]
        end
                                68, 0, 287 
                        ]
        end

-       private meth action_table_row157: Array[Int]
+       private fun action_table_row157: Array[Int]

        do
                return [
                                -1, 1, 400 
                        ]
        end
        do
                return [
                                -1, 1, 400 
                        ]
        end

-       private meth action_table_row158: Array[Int]
+       private fun action_table_row158: Array[Int]

        do
                return [
                                -1, 1, 404 
                        ]
        end
        do
                return [
                                -1, 1, 404 
                        ]
        end

-       private meth action_table_row159: Array[Int]
+       private fun action_table_row159: Array[Int]

        do
                return [
                                -1, 1, 407 ,
        do
                return [
                                -1, 1, 407 ,

@@ -3057,26 +3057,26 @@ abstract class ParserTable
                                63, 0, 288 
                        ]
        end
                                63, 0, 288 
                        ]
        end

-       private meth action_table_row160: Array[Int]
+       private fun action_table_row160: Array[Int]

        do
                return [
                                -1, 3, 159 ,
                                42, 0, 290 
                        ]
        end
        do
                return [
                                -1, 3, 159 ,
                                42, 0, 290 
                        ]
        end

-       private meth action_table_row161: Array[Int]
+       private fun action_table_row161: Array[Int]

        do
                return [
                                -1, 1, 322 
                        ]
        end
        do
                return [
                                -1, 1, 322 
                        ]
        end

-       private meth action_table_row162: Array[Int]
+       private fun action_table_row162: Array[Int]

        do
                return [
                                -1, 1, 319 
                        ]
        end
        do
                return [
                                -1, 1, 319 
                        ]
        end

-       private meth action_table_row163: Array[Int]
+       private fun action_table_row163: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -3085,7 +3085,7 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row164: Array[Int]
+       private fun action_table_row164: Array[Int]

        do
                return [
                                -1, 3, 163 ,
        do
                return [
                                -1, 3, 163 ,

@@ -3113,13 +3113,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row165: Array[Int]
+       private fun action_table_row165: Array[Int]

        do
                return [
                                -1, 1, 373 
                        ]
        end
        do
                return [
                                -1, 1, 373 
                        ]
        end

-       private meth action_table_row166: Array[Int]
+       private fun action_table_row166: Array[Int]

        do
                return [
                                -1, 3, 165 ,
        do
                return [
                                -1, 3, 165 ,

@@ -3127,19 +3127,19 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row167: Array[Int]
+       private fun action_table_row167: Array[Int]

        do
                return [
                                -1, 1, 415 
                        ]
        end
        do
                return [
                                -1, 1, 415 
                        ]
        end

-       private meth action_table_row168: Array[Int]
+       private fun action_table_row168: Array[Int]

        do
                return [
                                -1, 1, 332 
                        ]
        end
        do
                return [
                                -1, 1, 332 
                        ]
        end

-       private meth action_table_row169: Array[Int]
+       private fun action_table_row169: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -3147,14 +3147,14 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row170: Array[Int]
+       private fun action_table_row170: Array[Int]

        do
                return [
                                -1, 3, 169 ,
                                52, 0, 297 
                        ]
        end
        do
                return [
                                -1, 3, 169 ,
                                52, 0, 297 
                        ]
        end

-       private meth action_table_row171: Array[Int]
+       private fun action_table_row171: Array[Int]

        do
                return [
                                -1, 1, 407 ,
        do
                return [
                                -1, 1, 407 ,

@@ -3162,7 +3162,7 @@ abstract class ParserTable
                                63, 0, 298 
                        ]
        end
                                63, 0, 298 
                        ]
        end

-       private meth action_table_row172: Array[Int]
+       private fun action_table_row172: Array[Int]

        do
                return [
                                -1, 3, 171 ,
        do
                return [
                                -1, 3, 171 ,

@@ -3190,7 +3190,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row173: Array[Int]
+       private fun action_table_row173: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3198,7 +3198,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row174: Array[Int]
+       private fun action_table_row174: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3206,7 +3206,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row175: Array[Int]
+       private fun action_table_row175: Array[Int]

        do
                return [
                                -1, 1, 414 ,
        do
                return [
                                -1, 1, 414 ,

@@ -3215,14 +3215,14 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row176: Array[Int]
+       private fun action_table_row176: Array[Int]

        do
                return [
                                -1, 1, 329 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 1, 329 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row177: Array[Int]
+       private fun action_table_row177: Array[Int]

        do
                return [
                                -1, 3, 176 ,
        do
                return [
                                -1, 3, 176 ,

@@ -3250,19 +3250,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row178: Array[Int]
+       private fun action_table_row178: Array[Int]

        do
                return [
                                -1, 1, 360 
                        ]
        end
        do
                return [
                                -1, 1, 360 
                        ]
        end

-       private meth action_table_row179: Array[Int]
+       private fun action_table_row179: Array[Int]

        do
                return [
                                -1, 1, 361 
                        ]
        end
        do
                return [
                                -1, 1, 361 
                        ]
        end

-       private meth action_table_row180: Array[Int]
+       private fun action_table_row180: Array[Int]

        do
                return [
                                -1, 3, 179 ,
        do
                return [
                                -1, 3, 179 ,

@@ -3290,7 +3290,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row181: Array[Int]
+       private fun action_table_row181: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3298,32 +3298,32 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row182: Array[Int]
+       private fun action_table_row182: Array[Int]

        do
                return [
                                -1, 1, 79 
                        ]
        end
        do
                return [
                                -1, 1, 79 
                        ]
        end

-       private meth action_table_row183: Array[Int]
+       private fun action_table_row183: Array[Int]

        do
                return [
                                -1, 3, 182 ,
                                4, 0, 312 
                        ]
        end
        do
                return [
                                -1, 3, 182 ,
                                4, 0, 312 
                        ]
        end

-       private meth action_table_row184: Array[Int]
+       private fun action_table_row184: Array[Int]

        do
                return [
                                -1, 1, 81 
                        ]
        end
        do
                return [
                                -1, 1, 81 
                        ]
        end

-       private meth action_table_row185: Array[Int]
+       private fun action_table_row185: Array[Int]

        do
                return [
                                -1, 1, 82 
                        ]
        end
        do
                return [
                                -1, 1, 82 
                        ]
        end

-       private meth action_table_row186: Array[Int]
+       private fun action_table_row186: Array[Int]

        do
                return [
                                -1, 3, 185 ,
        do
                return [
                                -1, 3, 185 ,

@@ -3343,7 +3343,7 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row187: Array[Int]
+       private fun action_table_row187: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3351,13 +3351,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row188: Array[Int]
+       private fun action_table_row188: Array[Int]

        do
                return [
                                -1, 1, 724 
                        ]
        end
        do
                return [
                                -1, 1, 724 
                        ]
        end

-       private meth action_table_row189: Array[Int]
+       private fun action_table_row189: Array[Int]

        do
                return [
                                -1, 1, 468 ,
        do
                return [
                                -1, 1, 468 ,

@@ -3390,13 +3390,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row190: Array[Int]
+       private fun action_table_row190: Array[Int]

        do
                return [
                                -1, 1, 53 
                        ]
        end
        do
                return [
                                -1, 1, 53 
                        ]
        end

-       private meth action_table_row191: Array[Int]
+       private fun action_table_row191: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3404,7 +3404,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row192: Array[Int]
+       private fun action_table_row192: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3412,7 +3412,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row193: Array[Int]
+       private fun action_table_row193: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3420,7 +3420,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row194: Array[Int]
+       private fun action_table_row194: Array[Int]

        do
                return [
                                -1, 1, 419 ,
        do
                return [
                                -1, 1, 419 ,

@@ -3429,25 +3429,25 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row195: Array[Int]
+       private fun action_table_row195: Array[Int]

        do
                return [
                                -1, 1, 441 
                        ]
        end
        do
                return [
                                -1, 1, 441 
                        ]
        end

-       private meth action_table_row196: Array[Int]
+       private fun action_table_row196: Array[Int]

        do
                return [
                                -1, 1, 442 
                        ]
        end
        do
                return [
                                -1, 1, 442 
                        ]
        end

-       private meth action_table_row197: Array[Int]
+       private fun action_table_row197: Array[Int]

        do
                return [
                                -1, 1, 726 
                        ]
        end
        do
                return [
                                -1, 1, 726 
                        ]
        end

-       private meth action_table_row198: Array[Int]
+       private fun action_table_row198: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3455,13 +3455,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row199: Array[Int]
+       private fun action_table_row199: Array[Int]

        do
                return [
                                -1, 1, 436 
                        ]
        end
        do
                return [
                                -1, 1, 436 
                        ]
        end

-       private meth action_table_row200: Array[Int]
+       private fun action_table_row200: Array[Int]

        do
                return [
                                -1, 3, 199 ,
        do
                return [
                                -1, 3, 199 ,

@@ -3469,7 +3469,7 @@ abstract class ParserTable
                                85, 0, 195 
                        ]
        end
                                85, 0, 195 
                        ]
        end

-       private meth action_table_row201: Array[Int]
+       private fun action_table_row201: Array[Int]

        do
                return [
                                -1, 3, 200 ,
        do
                return [
                                -1, 3, 200 ,

@@ -3497,7 +3497,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row202: Array[Int]
+       private fun action_table_row202: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -3526,39 +3526,39 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row203: Array[Int]
+       private fun action_table_row203: Array[Int]

        do
                return [
                                -1, 3, 202 ,
                                57, 0, 173 
                        ]
        end
        do
                return [
                                -1, 3, 202 ,
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row204: Array[Int]
+       private fun action_table_row204: Array[Int]

        do
                return [
                                -1, 1, 731 
                        ]
        end
        do
                return [
                                -1, 1, 731 
                        ]
        end

-       private meth action_table_row205: Array[Int]
+       private fun action_table_row205: Array[Int]

        do
                return [
                                -1, 1, 458 
                        ]
        end
        do
                return [
                                -1, 1, 458 
                        ]
        end

-       private meth action_table_row206: Array[Int]
+       private fun action_table_row206: Array[Int]

        do
                return [
                                -1, 1, 470 ,
                                0, 0, 86 
                        ]
        end
        do
                return [
                                -1, 1, 470 ,
                                0, 0, 86 
                        ]
        end

-       private meth action_table_row207: Array[Int]
+       private fun action_table_row207: Array[Int]

        do
                return [
                                -1, 1, 32 
                        ]
        end
        do
                return [
                                -1, 1, 32 
                        ]
        end

-       private meth action_table_row208: Array[Int]
+       private fun action_table_row208: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -3595,13 +3595,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row209: Array[Int]
+       private fun action_table_row209: Array[Int]

        do
                return [
                                -1, 1, 736 
                        ]
        end
        do
                return [
                                -1, 1, 736 
                        ]
        end

-       private meth action_table_row210: Array[Int]
+       private fun action_table_row210: Array[Int]

        do
                return [
                                -1, 3, 209 ,
        do
                return [
                                -1, 3, 209 ,

@@ -3609,7 +3609,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row211: Array[Int]
+       private fun action_table_row211: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3618,7 +3618,7 @@ abstract class ParserTable
                                86, 1, 9 
                        ]
        end
                                86, 1, 9 
                        ]
        end

-       private meth action_table_row212: Array[Int]
+       private fun action_table_row212: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3627,13 +3627,13 @@ abstract class ParserTable
                                86, 1, 12 
                        ]
        end
                                86, 1, 12 
                        ]
        end

-       private meth action_table_row213: Array[Int]
+       private fun action_table_row213: Array[Int]

        do
                return [
                                -1, 1, 30 
                        ]
        end
        do
                return [
                                -1, 1, 30 
                        ]
        end

-       private meth action_table_row214: Array[Int]
+       private fun action_table_row214: Array[Int]

        do
                return [
                                -1, 3, 213 ,
        do
                return [
                                -1, 3, 213 ,

@@ -3641,7 +3641,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row215: Array[Int]
+       private fun action_table_row215: Array[Int]

        do
                return [
                                -1, 3, 214 ,
        do
                return [
                                -1, 3, 214 ,

@@ -3652,7 +3652,7 @@ abstract class ParserTable
                                10, 0, 185 
                        ]
        end
                                10, 0, 185 
                        ]
        end

-       private meth action_table_row216: Array[Int]
+       private fun action_table_row216: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3661,13 +3661,13 @@ abstract class ParserTable
                                86, 1, 16 
                        ]
        end
                                86, 1, 16 
                        ]
        end

-       private meth action_table_row217: Array[Int]
+       private fun action_table_row217: Array[Int]

        do
                return [
                                -1, 1, 34 
                        ]
        end
        do
                return [
                                -1, 1, 34 
                        ]
        end

-       private meth action_table_row218: Array[Int]
+       private fun action_table_row218: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3676,7 +3676,7 @@ abstract class ParserTable
                                86, 1, 11 
                        ]
        end
                                86, 1, 11 
                        ]
        end

-       private meth action_table_row219: Array[Int]
+       private fun action_table_row219: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3685,13 +3685,13 @@ abstract class ParserTable
                                86, 1, 14 
                        ]
        end
                                86, 1, 14 
                        ]
        end

-       private meth action_table_row220: Array[Int]
+       private fun action_table_row220: Array[Int]

        do
                return [
                                -1, 1, 31 
                        ]
        end
        do
                return [
                                -1, 1, 31 
                        ]
        end

-       private meth action_table_row221: Array[Int]
+       private fun action_table_row221: Array[Int]

        do
                return [
                                -1, 3, 220 ,
        do
                return [
                                -1, 3, 220 ,

@@ -3699,7 +3699,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row222: Array[Int]
+       private fun action_table_row222: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3708,7 +3708,7 @@ abstract class ParserTable
                                86, 1, 18 
                        ]
        end
                                86, 1, 18 
                        ]
        end

-       private meth action_table_row223: Array[Int]
+       private fun action_table_row223: Array[Int]

        do
                return [
                                -1, 3, 222 ,
        do
                return [
                                -1, 3, 222 ,

@@ -3716,7 +3716,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row224: Array[Int]
+       private fun action_table_row224: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3724,13 +3724,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row225: Array[Int]
+       private fun action_table_row225: Array[Int]

        do
                return [
                                -1, 1, 637 
                        ]
        end
        do
                return [
                                -1, 1, 637 
                        ]
        end

-       private meth action_table_row226: Array[Int]
+       private fun action_table_row226: Array[Int]

        do
                return [
                                -1, 3, 225 ,
        do
                return [
                                -1, 3, 225 ,

@@ -3758,7 +3758,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row227: Array[Int]
+       private fun action_table_row227: Array[Int]

        do
                return [
                                -1, 3, 226 ,
        do
                return [
                                -1, 3, 226 ,

@@ -3783,7 +3783,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row228: Array[Int]
+       private fun action_table_row228: Array[Int]

        do
                return [
                                -1, 3, 227 ,
        do
                return [
                                -1, 3, 227 ,

@@ -3791,7 +3791,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row229: Array[Int]
+       private fun action_table_row229: Array[Int]

        do
                return [
                                -1, 3, 228 ,
        do
                return [
                                -1, 3, 228 ,

@@ -3815,13 +3815,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row230: Array[Int]
+       private fun action_table_row230: Array[Int]

        do
                return [
                                -1, 1, 634 
                        ]
        end
        do
                return [
                                -1, 1, 634 
                        ]
        end

-       private meth action_table_row231: Array[Int]
+       private fun action_table_row231: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3829,21 +3829,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row232: Array[Int]
+       private fun action_table_row232: Array[Int]

        do
                return [
                                -1, 1, 629 ,
                                63, 1, 631 
                        ]
        end
        do
                return [
                                -1, 1, 629 ,
                                63, 1, 631 
                        ]
        end

-       private meth action_table_row233: Array[Int]
+       private fun action_table_row233: Array[Int]

        do
                return [
                                -1, 3, 232 ,
                                63, 0, 365 
                        ]
        end
        do
                return [
                                -1, 3, 232 ,
                                63, 0, 365 
                        ]
        end

-       private meth action_table_row234: Array[Int]
+       private fun action_table_row234: Array[Int]

        do
                return [
                                -1, 3, 233 ,
        do
                return [
                                -1, 3, 233 ,

@@ -3872,7 +3872,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row235: Array[Int]
+       private fun action_table_row235: Array[Int]

        do
                return [
                                -1, 3, 234 ,
        do
                return [
                                -1, 3, 234 ,

@@ -3896,20 +3896,20 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row236: Array[Int]
+       private fun action_table_row236: Array[Int]

        do
                return [
                                -1, 1, 633 
                        ]
        end
        do
                return [
                                -1, 1, 633 
                        ]
        end

-       private meth action_table_row237: Array[Int]
+       private fun action_table_row237: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row238: Array[Int]
+       private fun action_table_row238: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3917,7 +3917,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row239: Array[Int]
+       private fun action_table_row239: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3925,7 +3925,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row240: Array[Int]
+       private fun action_table_row240: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3933,7 +3933,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row241: Array[Int]
+       private fun action_table_row241: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3941,7 +3941,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row242: Array[Int]
+       private fun action_table_row242: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3949,7 +3949,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row243: Array[Int]
+       private fun action_table_row243: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3957,7 +3957,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row244: Array[Int]
+       private fun action_table_row244: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3965,7 +3965,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row245: Array[Int]
+       private fun action_table_row245: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3973,7 +3973,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row246: Array[Int]
+       private fun action_table_row246: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3981,7 +3981,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row247: Array[Int]
+       private fun action_table_row247: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3989,7 +3989,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row248: Array[Int]
+       private fun action_table_row248: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -3997,7 +3997,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row249: Array[Int]
+       private fun action_table_row249: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4005,7 +4005,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row250: Array[Int]
+       private fun action_table_row250: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4013,7 +4013,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row251: Array[Int]
+       private fun action_table_row251: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4021,7 +4021,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row252: Array[Int]
+       private fun action_table_row252: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4029,7 +4029,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row253: Array[Int]
+       private fun action_table_row253: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4037,7 +4037,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row254: Array[Int]
+       private fun action_table_row254: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4045,7 +4045,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row255: Array[Int]
+       private fun action_table_row255: Array[Int]

        do
                return [
                                -1, 3, 254 ,
        do
                return [
                                -1, 3, 254 ,

@@ -4065,7 +4065,7 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row256: Array[Int]
+       private fun action_table_row256: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4073,13 +4073,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row257: Array[Int]
+       private fun action_table_row257: Array[Int]

        do
                return [
                                -1, 1, 311 
                        ]
        end
        do
                return [
                                -1, 1, 311 
                        ]
        end

-       private meth action_table_row258: Array[Int]
+       private fun action_table_row258: Array[Int]

        do
                return [
                                -1, 3, 257 ,
        do
                return [
                                -1, 3, 257 ,

@@ -4087,7 +4087,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row259: Array[Int]
+       private fun action_table_row259: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4095,7 +4095,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row260: Array[Int]
+       private fun action_table_row260: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4103,14 +4103,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row261: Array[Int]
+       private fun action_table_row261: Array[Int]

        do
                return [
                                -1, 1, 347 ,
                                58, 0, 393 
                        ]
        end
        do
                return [
                                -1, 1, 347 ,
                                58, 0, 393 
                        ]
        end

-       private meth action_table_row262: Array[Int]
+       private fun action_table_row262: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4118,7 +4118,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row263: Array[Int]
+       private fun action_table_row263: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4126,7 +4126,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row264: Array[Int]
+       private fun action_table_row264: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4134,7 +4134,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row265: Array[Int]
+       private fun action_table_row265: Array[Int]

        do
                return [
                                -1, 3, 264 ,
        do
                return [
                                -1, 3, 264 ,

@@ -4162,7 +4162,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row266: Array[Int]
+       private fun action_table_row266: Array[Int]

        do
                return [
                                -1, 3, 265 ,
        do
                return [
                                -1, 3, 265 ,

@@ -4189,7 +4189,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row267: Array[Int]
+       private fun action_table_row267: Array[Int]

        do
                return [
                                -1, 3, 266 ,
        do
                return [
                                -1, 3, 266 ,

@@ -4197,7 +4197,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row268: Array[Int]
+       private fun action_table_row268: Array[Int]

        do
                return [
                                -1, 3, 267 ,
        do
                return [
                                -1, 3, 267 ,

@@ -4223,7 +4223,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row269: Array[Int]
+       private fun action_table_row269: Array[Int]

        do
                return [
                                -1, 1, 410 ,
        do
                return [
                                -1, 1, 410 ,

@@ -4231,7 +4231,7 @@ abstract class ParserTable
                                63, 1, 412 
                        ]
        end
                                63, 1, 412 
                        ]
        end

-       private meth action_table_row270: Array[Int]
+       private fun action_table_row270: Array[Int]

        do
                return [
                                -1, 3, 269 ,
        do
                return [
                                -1, 3, 269 ,

@@ -4239,7 +4239,7 @@ abstract class ParserTable
                                63, 0, 401 
                        ]
        end
                                63, 0, 401 
                        ]
        end

-       private meth action_table_row271: Array[Int]
+       private fun action_table_row271: Array[Int]

        do
                return [
                                -1, 3, 270 ,
        do
                return [
                                -1, 3, 270 ,

@@ -4265,14 +4265,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row272: Array[Int]
+       private fun action_table_row272: Array[Int]

        do
                return [
                                -1, 1, 414 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 1, 414 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row273: Array[Int]
+       private fun action_table_row273: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4280,7 +4280,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row274: Array[Int]
+       private fun action_table_row274: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4288,7 +4288,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row275: Array[Int]
+       private fun action_table_row275: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4296,7 +4296,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row276: Array[Int]
+       private fun action_table_row276: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4304,7 +4304,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row277: Array[Int]
+       private fun action_table_row277: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4312,7 +4312,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row278: Array[Int]
+       private fun action_table_row278: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4320,7 +4320,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row279: Array[Int]
+       private fun action_table_row279: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4328,7 +4328,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row280: Array[Int]
+       private fun action_table_row280: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4336,7 +4336,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row281: Array[Int]
+       private fun action_table_row281: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4344,7 +4344,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row282: Array[Int]
+       private fun action_table_row282: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4352,7 +4352,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row283: Array[Int]
+       private fun action_table_row283: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4360,7 +4360,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row284: Array[Int]
+       private fun action_table_row284: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4368,7 +4368,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row285: Array[Int]
+       private fun action_table_row285: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4376,7 +4376,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row286: Array[Int]
+       private fun action_table_row286: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4384,7 +4384,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row287: Array[Int]
+       private fun action_table_row287: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4392,7 +4392,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row288: Array[Int]
+       private fun action_table_row288: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4400,7 +4400,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row289: Array[Int]
+       private fun action_table_row289: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4408,66 +4408,66 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row290: Array[Int]
+       private fun action_table_row290: Array[Int]

        do
                return [
                                -1, 1, 419 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 1, 419 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row291: Array[Int]
+       private fun action_table_row291: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row292: Array[Int]
+       private fun action_table_row292: Array[Int]

        do
                return [
                                -1, 1, 375 
                        ]
        end
        do
                return [
                                -1, 1, 375 
                        ]
        end

-       private meth action_table_row293: Array[Int]
+       private fun action_table_row293: Array[Int]

        do
                return [
                                -1, 1, 374 
                        ]
        end
        do
                return [
                                -1, 1, 374 
                        ]
        end

-       private meth action_table_row294: Array[Int]
+       private fun action_table_row294: Array[Int]

        do
                return [
                                -1, 3, 293 ,
                                76, 0, 422 
                        ]
        end
        do
                return [
                                -1, 3, 293 ,
                                76, 0, 422 
                        ]
        end

-       private meth action_table_row295: Array[Int]
+       private fun action_table_row295: Array[Int]

        do
                return [
                                -1, 1, 300 ,
                                53, 0, 423 
                        ]
        end
        do
                return [
                                -1, 1, 300 ,
                                53, 0, 423 
                        ]
        end

-       private meth action_table_row296: Array[Int]
+       private fun action_table_row296: Array[Int]

        do
                return [
                                -1, 3, 295 ,
                                63, 0, 424 
                        ]
        end
        do
                return [
                                -1, 3, 295 ,
                                63, 0, 424 
                        ]
        end

-       private meth action_table_row297: Array[Int]
+       private fun action_table_row297: Array[Int]

        do
                return [
                                -1, 1, 414 
                        ]
        end
        do
                return [
                                -1, 1, 414 
                        ]
        end

-       private meth action_table_row298: Array[Int]
+       private fun action_table_row298: Array[Int]

        do
                return [
                                -1, 1, 433 
                        ]
        end
        do
                return [
                                -1, 1, 433 
                        ]
        end

-       private meth action_table_row299: Array[Int]
+       private fun action_table_row299: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4475,13 +4475,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row300: Array[Int]
+       private fun action_table_row300: Array[Int]

        do
                return [
                                -1, 1, 419 
                        ]
        end
        do
                return [
                                -1, 1, 419 
                        ]
        end

-       private meth action_table_row301: Array[Int]
+       private fun action_table_row301: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4489,19 +4489,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row302: Array[Int]
+       private fun action_table_row302: Array[Int]

        do
                return [
                                -1, 1, 461 
                        ]
        end
        do
                return [
                                -1, 1, 461 
                        ]
        end

-       private meth action_table_row303: Array[Int]
+       private fun action_table_row303: Array[Int]

        do
                return [
                                -1, 1, 460 
                        ]
        end
        do
                return [
                                -1, 1, 460 
                        ]
        end

-       private meth action_table_row304: Array[Int]
+       private fun action_table_row304: Array[Int]

        do
                return [
                                -1, 3, 303 ,
        do
                return [
                                -1, 3, 303 ,

@@ -4529,7 +4529,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row305: Array[Int]
+       private fun action_table_row305: Array[Int]

        do
                return [
                                -1, 3, 304 ,
        do
                return [
                                -1, 3, 304 ,

@@ -4557,7 +4557,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row306: Array[Int]
+       private fun action_table_row306: Array[Int]

        do
                return [
                                -1, 3, 305 ,
        do
                return [
                                -1, 3, 305 ,

@@ -4565,38 +4565,38 @@ abstract class ParserTable
                                77, 0, 430 
                        ]
        end
                                77, 0, 430 
                        ]
        end

-       private meth action_table_row307: Array[Int]
+       private fun action_table_row307: Array[Int]

        do
                return [
                                -1, 1, 331 
                        ]
        end
        do
                return [
                                -1, 1, 331 
                        ]
        end

-       private meth action_table_row308: Array[Int]
+       private fun action_table_row308: Array[Int]

        do
                return [
                                -1, 1, 336 
                        ]
        end
        do
                return [
                                -1, 1, 336 
                        ]
        end

-       private meth action_table_row309: Array[Int]
+       private fun action_table_row309: Array[Int]

        do
                return [
                                -1, 3, 308 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 3, 308 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row310: Array[Int]
+       private fun action_table_row310: Array[Int]

        do
                return [
                                -1, 1, 351 
                        ]
        end
        do
                return [
                                -1, 1, 351 
                        ]
        end

-       private meth action_table_row311: Array[Int]
+       private fun action_table_row311: Array[Int]

        do
                return [
                                -1, 1, 356 
                        ]
        end
        do
                return [
                                -1, 1, 356 
                        ]
        end

-       private meth action_table_row312: Array[Int]
+       private fun action_table_row312: Array[Int]

        do
                return [
                                -1, 3, 311 ,
        do
                return [
                                -1, 3, 311 ,

@@ -4604,99 +4604,99 @@ abstract class ParserTable
                                77, 0, 434 
                        ]
        end
                                77, 0, 434 
                        ]
        end

-       private meth action_table_row313: Array[Int]
+       private fun action_table_row313: Array[Int]

        do
                return [
                                -1, 1, 80 
                        ]
        end
        do
                return [
                                -1, 1, 80 
                        ]
        end

-       private meth action_table_row314: Array[Int]
+       private fun action_table_row314: Array[Int]

        do
                return [
                                -1, 3, 313 ,
                                54, 0, 435 
                        ]
        end
        do
                return [
                                -1, 3, 313 ,
                                54, 0, 435 
                        ]
        end

-       private meth action_table_row315: Array[Int]
+       private fun action_table_row315: Array[Int]

        do
                return [
                                -1, 1, 261 
                        ]
        end
        do
                return [
                                -1, 1, 261 
                        ]
        end

-       private meth action_table_row316: Array[Int]
+       private fun action_table_row316: Array[Int]

        do
                return [
                                -1, 1, 262 
                        ]
        end
        do
                return [
                                -1, 1, 262 
                        ]
        end

-       private meth action_table_row317: Array[Int]
+       private fun action_table_row317: Array[Int]

        do
                return [
                                -1, 1, 263 
                        ]
        end
        do
                return [
                                -1, 1, 263 
                        ]
        end

-       private meth action_table_row318: Array[Int]
+       private fun action_table_row318: Array[Int]

        do
                return [
                                -1, 1, 264 
                        ]
        end
        do
                return [
                                -1, 1, 264 
                        ]
        end

-       private meth action_table_row319: Array[Int]
+       private fun action_table_row319: Array[Int]

        do
                return [
                                -1, 1, 265 
                        ]
        end
        do
                return [
                                -1, 1, 265 
                        ]
        end

-       private meth action_table_row320: Array[Int]
+       private fun action_table_row320: Array[Int]

        do
                return [
                                -1, 1, 266 
                        ]
        end
        do
                return [
                                -1, 1, 266 
                        ]
        end

-       private meth action_table_row321: Array[Int]
+       private fun action_table_row321: Array[Int]

        do
                return [
                                -1, 1, 267 
                        ]
        end
        do
                return [
                                -1, 1, 267 
                        ]
        end

-       private meth action_table_row322: Array[Int]
+       private fun action_table_row322: Array[Int]

        do
                return [
                                -1, 1, 270 
                        ]
        end
        do
                return [
                                -1, 1, 270 
                        ]
        end

-       private meth action_table_row323: Array[Int]
+       private fun action_table_row323: Array[Int]

        do
                return [
                                -1, 1, 268 
                        ]
        end
        do
                return [
                                -1, 1, 268 
                        ]
        end

-       private meth action_table_row324: Array[Int]
+       private fun action_table_row324: Array[Int]

        do
                return [
                                -1, 1, 271 
                        ]
        end
        do
                return [
                                -1, 1, 271 
                        ]
        end

-       private meth action_table_row325: Array[Int]
+       private fun action_table_row325: Array[Int]

        do
                return [
                                -1, 1, 269 
                        ]
        end
        do
                return [
                                -1, 1, 269 
                        ]
        end

-       private meth action_table_row326: Array[Int]
+       private fun action_table_row326: Array[Int]

        do
                return [
                                -1, 1, 273 
                        ]
        end
        do
                return [
                                -1, 1, 273 
                        ]
        end

-       private meth action_table_row327: Array[Int]
+       private fun action_table_row327: Array[Int]

        do
                return [
                                -1, 1, 260 ,
                                58, 0, 436 
                        ]
        end
        do
                return [
                                -1, 1, 260 ,
                                58, 0, 436 
                        ]
        end

-       private meth action_table_row328: Array[Int]
+       private fun action_table_row328: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4706,32 +4706,32 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row329: Array[Int]
+       private fun action_table_row329: Array[Int]

        do
                return [
                                -1, 3, 328 ,
                                76, 0, 443 
                        ]
        end
        do
                return [
                                -1, 3, 328 ,
                                76, 0, 443 
                        ]
        end

-       private meth action_table_row330: Array[Int]
+       private fun action_table_row330: Array[Int]

        do
                return [
                                -1, 1, 313 
                        ]
        end
        do
                return [
                                -1, 1, 313 
                        ]
        end

-       private meth action_table_row331: Array[Int]
+       private fun action_table_row331: Array[Int]

        do
                return [
                                -1, 1, 725 
                        ]
        end
        do
                return [
                                -1, 1, 725 
                        ]
        end

-       private meth action_table_row332: Array[Int]
+       private fun action_table_row332: Array[Int]

        do
                return [
                                -1, 1, 54 
                        ]
        end
        do
                return [
                                -1, 1, 54 
                        ]
        end

-       private meth action_table_row333: Array[Int]
+       private fun action_table_row333: Array[Int]

        do
                return [
                                -1, 3, 332 ,
        do
                return [
                                -1, 3, 332 ,

@@ -4759,7 +4759,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row334: Array[Int]
+       private fun action_table_row334: Array[Int]

        do
                return [
                                -1, 3, 333 ,
        do
                return [
                                -1, 3, 333 ,

@@ -4769,7 +4769,7 @@ abstract class ParserTable
                                78, 0, 448 
                        ]
        end
                                78, 0, 448 
                        ]
        end

-       private meth action_table_row335: Array[Int]
+       private fun action_table_row335: Array[Int]

        do
                return [
                                -1, 3, 334 ,
        do
                return [
                                -1, 3, 334 ,

@@ -4797,7 +4797,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row336: Array[Int]
+       private fun action_table_row336: Array[Int]

        do
                return [
                                -1, 3, 335 ,
        do
                return [
                                -1, 3, 335 ,

@@ -4825,7 +4825,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row337: Array[Int]
+       private fun action_table_row337: Array[Int]

        do
                return [
                                -1, 3, 336 ,
        do
                return [
                                -1, 3, 336 ,

@@ -4853,19 +4853,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row338: Array[Int]
+       private fun action_table_row338: Array[Int]

        do
                return [
                                -1, 1, 727 
                        ]
        end
        do
                return [
                                -1, 1, 727 
                        ]
        end

-       private meth action_table_row339: Array[Int]
+       private fun action_table_row339: Array[Int]

        do
                return [
                                -1, 1, 437 
                        ]
        end
        do
                return [
                                -1, 1, 437 
                        ]
        end

-       private meth action_table_row340: Array[Int]
+       private fun action_table_row340: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4873,19 +4873,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row341: Array[Int]
+       private fun action_table_row341: Array[Int]

        do
                return [
                                -1, 1, 416 
                        ]
        end
        do
                return [
                                -1, 1, 416 
                        ]
        end

-       private meth action_table_row342: Array[Int]
+       private fun action_table_row342: Array[Int]

        do
                return [
                                -1, 1, 333 
                        ]
        end
        do
                return [
                                -1, 1, 333 
                        ]
        end

-       private meth action_table_row343: Array[Int]
+       private fun action_table_row343: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -4894,38 +4894,38 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row344: Array[Int]
+       private fun action_table_row344: Array[Int]

        do
                return [
                                -1, 3, 343 ,
                                10, 0, 185 
                        ]
        end
        do
                return [
                                -1, 3, 343 ,
                                10, 0, 185 
                        ]
        end

-       private meth action_table_row345: Array[Int]
+       private fun action_table_row345: Array[Int]

        do
                return [
                                -1, 1, 472 
                        ]
        end
        do
                return [
                                -1, 1, 472 
                        ]
        end

-       private meth action_table_row346: Array[Int]
+       private fun action_table_row346: Array[Int]

        do
                return [
                                -1, 1, 33 
                        ]
        end
        do
                return [
                                -1, 1, 33 
                        ]
        end

-       private meth action_table_row347: Array[Int]
+       private fun action_table_row347: Array[Int]

        do
                return [
                                -1, 1, 737 
                        ]
        end
        do
                return [
                                -1, 1, 737 
                        ]
        end

-       private meth action_table_row348: Array[Int]
+       private fun action_table_row348: Array[Int]

        do
                return [
                                -1, 1, 36 
                        ]
        end
        do
                return [
                                -1, 1, 36 
                        ]
        end

-       private meth action_table_row349: Array[Int]
+       private fun action_table_row349: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4934,7 +4934,7 @@ abstract class ParserTable
                                86, 1, 13 
                        ]
        end
                                86, 1, 13 
                        ]
        end

-       private meth action_table_row350: Array[Int]
+       private fun action_table_row350: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4943,13 +4943,13 @@ abstract class ParserTable
                                86, 1, 20 
                        ]
        end
                                86, 1, 20 
                        ]
        end

-       private meth action_table_row351: Array[Int]
+       private fun action_table_row351: Array[Int]

        do
                return [
                                -1, 1, 40 
                        ]
        end
        do
                return [
                                -1, 1, 40 
                        ]
        end

-       private meth action_table_row352: Array[Int]
+       private fun action_table_row352: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4958,19 +4958,19 @@ abstract class ParserTable
                                86, 1, 17 
                        ]
        end
                                86, 1, 17 
                        ]
        end

-       private meth action_table_row353: Array[Int]
+       private fun action_table_row353: Array[Int]

        do
                return [
                                -1, 1, 35 
                        ]
        end
        do
                return [
                                -1, 1, 35 
                        ]
        end

-       private meth action_table_row354: Array[Int]
+       private fun action_table_row354: Array[Int]

        do
                return [
                                -1, 1, 38 
                        ]
        end
        do
                return [
                                -1, 1, 38 
                        ]
        end

-       private meth action_table_row355: Array[Int]
+       private fun action_table_row355: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4979,7 +4979,7 @@ abstract class ParserTable
                                86, 1, 15 
                        ]
        end
                                86, 1, 15 
                        ]
        end

-       private meth action_table_row356: Array[Int]
+       private fun action_table_row356: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -4988,13 +4988,13 @@ abstract class ParserTable
                                86, 1, 22 
                        ]
        end
                                86, 1, 22 
                        ]
        end

-       private meth action_table_row357: Array[Int]
+       private fun action_table_row357: Array[Int]

        do
                return [
                                -1, 1, 42 
                        ]
        end
        do
                return [
                                -1, 1, 42 
                        ]
        end

-       private meth action_table_row358: Array[Int]
+       private fun action_table_row358: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5003,13 +5003,13 @@ abstract class ParserTable
                                86, 1, 19 
                        ]
        end
                                86, 1, 19 
                        ]
        end

-       private meth action_table_row359: Array[Int]
+       private fun action_table_row359: Array[Int]

        do
                return [
                                -1, 1, 48 
                        ]
        end
        do
                return [
                                -1, 1, 48 
                        ]
        end

-       private meth action_table_row360: Array[Int]
+       private fun action_table_row360: Array[Int]

        do
                return [
                                -1, 3, 359 ,
        do
                return [
                                -1, 3, 359 ,

@@ -5038,7 +5038,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row361: Array[Int]
+       private fun action_table_row361: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5046,13 +5046,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row362: Array[Int]
+       private fun action_table_row362: Array[Int]

        do
                return [
                                -1, 1, 605 
                        ]
        end
        do
                return [
                                -1, 1, 605 
                        ]
        end

-       private meth action_table_row363: Array[Int]
+       private fun action_table_row363: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -5060,13 +5060,13 @@ abstract class ParserTable
                                63, 0, 465 
                        ]
        end
                                63, 0, 465 
                        ]
        end

-       private meth action_table_row364: Array[Int]
+       private fun action_table_row364: Array[Int]

        do
                return [
                                -1, 1, 625 
                        ]
        end
        do
                return [
                                -1, 1, 625 
                        ]
        end

-       private meth action_table_row365: Array[Int]
+       private fun action_table_row365: Array[Int]

        do
                return [
                                -1, 3, 364 ,
        do
                return [
                                -1, 3, 364 ,

@@ -5074,7 +5074,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row366: Array[Int]
+       private fun action_table_row366: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5082,7 +5082,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row367: Array[Int]
+       private fun action_table_row367: Array[Int]

        do
                return [
                                -1, 1, 450 ,
        do
                return [
                                -1, 1, 450 ,

@@ -5093,7 +5093,7 @@ abstract class ParserTable
                                63, 1, 445 
                        ]
        end
                                63, 1, 445 
                        ]
        end

-       private meth action_table_row368: Array[Int]
+       private fun action_table_row368: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5101,19 +5101,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row369: Array[Int]
+       private fun action_table_row369: Array[Int]

        do
                return [
                                -1, 1, 624 
                        ]
        end
        do
                return [
                                -1, 1, 624 
                        ]
        end

-       private meth action_table_row370: Array[Int]
+       private fun action_table_row370: Array[Int]

        do
                return [
                                -1, 1, 635 
                        ]
        end
        do
                return [
                                -1, 1, 635 
                        ]
        end

-       private meth action_table_row371: Array[Int]
+       private fun action_table_row371: Array[Int]

        do
                return [
                                -1, 3, 370 ,
        do
                return [
                                -1, 3, 370 ,

@@ -5138,7 +5138,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row372: Array[Int]
+       private fun action_table_row372: Array[Int]

        do
                return [
                                -1, 3, 371 ,
        do
                return [
                                -1, 3, 371 ,

@@ -5163,7 +5163,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row373: Array[Int]
+       private fun action_table_row373: Array[Int]

        do
                return [
                                -1, 3, 372 ,
        do
                return [
                                -1, 3, 372 ,

@@ -5187,7 +5187,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row374: Array[Int]
+       private fun action_table_row374: Array[Int]

        do
                return [
                                -1, 3, 373 ,
        do
                return [
                                -1, 3, 373 ,

@@ -5195,7 +5195,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row375: Array[Int]
+       private fun action_table_row375: Array[Int]

        do
                return [
                                -1, 3, 374 ,
        do
                return [
                                -1, 3, 374 ,

@@ -5219,7 +5219,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row376: Array[Int]
+       private fun action_table_row376: Array[Int]

        do
                return [
                                -1, 3, 375 ,
        do
                return [
                                -1, 3, 375 ,

@@ -5243,7 +5243,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row377: Array[Int]
+       private fun action_table_row377: Array[Int]

        do
                return [
                                -1, 3, 376 ,
        do
                return [
                                -1, 3, 376 ,

@@ -5267,7 +5267,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row378: Array[Int]
+       private fun action_table_row378: Array[Int]

        do
                return [
                                -1, 3, 377 ,
        do
                return [
                                -1, 3, 377 ,

@@ -5291,7 +5291,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row379: Array[Int]
+       private fun action_table_row379: Array[Int]

        do
                return [
                                -1, 3, 378 ,
        do
                return [
                                -1, 3, 378 ,

@@ -5315,7 +5315,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row380: Array[Int]
+       private fun action_table_row380: Array[Int]

        do
                return [
                                -1, 3, 379 ,
        do
                return [
                                -1, 3, 379 ,

@@ -5339,7 +5339,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row381: Array[Int]
+       private fun action_table_row381: Array[Int]

        do
                return [
                                -1, 3, 380 ,
        do
                return [
                                -1, 3, 380 ,

@@ -5363,7 +5363,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row382: Array[Int]
+       private fun action_table_row382: Array[Int]

        do
                return [
                                -1, 3, 381 ,
        do
                return [
                                -1, 3, 381 ,

@@ -5387,7 +5387,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row383: Array[Int]
+       private fun action_table_row383: Array[Int]

        do
                return [
                                -1, 3, 382 ,
        do
                return [
                                -1, 3, 382 ,

@@ -5411,7 +5411,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row384: Array[Int]
+       private fun action_table_row384: Array[Int]

        do
                return [
                                -1, 3, 383 ,
        do
                return [
                                -1, 3, 383 ,

@@ -5435,7 +5435,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row385: Array[Int]
+       private fun action_table_row385: Array[Int]

        do
                return [
                                -1, 3, 384 ,
        do
                return [
                                -1, 3, 384 ,

@@ -5459,7 +5459,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row386: Array[Int]
+       private fun action_table_row386: Array[Int]

        do
                return [
                                -1, 3, 385 ,
        do
                return [
                                -1, 3, 385 ,

@@ -5483,7 +5483,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row387: Array[Int]
+       private fun action_table_row387: Array[Int]

        do
                return [
                                -1, 3, 386 ,
        do
                return [
                                -1, 3, 386 ,

@@ -5493,7 +5493,7 @@ abstract class ParserTable
                                78, 0, 489 
                        ]
        end
                                78, 0, 489 
                        ]
        end

-       private meth action_table_row388: Array[Int]
+       private fun action_table_row388: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5503,14 +5503,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row389: Array[Int]
+       private fun action_table_row389: Array[Int]

        do
                return [
                                -1, 3, 388 ,
                                76, 0, 491 
                        ]
        end
        do
                return [
                                -1, 3, 388 ,
                                76, 0, 491 
                        ]
        end

-       private meth action_table_row390: Array[Int]
+       private fun action_table_row390: Array[Int]

        do
                return [
                                -1, 3, 389 ,
        do
                return [
                                -1, 3, 389 ,

@@ -5544,7 +5544,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row391: Array[Int]
+       private fun action_table_row391: Array[Int]

        do
                return [
                                -1, 3, 390 ,
        do
                return [
                                -1, 3, 390 ,

@@ -5552,7 +5552,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row392: Array[Int]
+       private fun action_table_row392: Array[Int]

        do
                return [
                                -1, 3, 391 ,
        do
                return [
                                -1, 3, 391 ,

@@ -5560,7 +5560,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row393: Array[Int]
+       private fun action_table_row393: Array[Int]

        do
                return [
                                -1, 3, 392 ,
        do
                return [
                                -1, 3, 392 ,

@@ -5588,7 +5588,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row394: Array[Int]
+       private fun action_table_row394: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5596,28 +5596,28 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row395: Array[Int]
+       private fun action_table_row395: Array[Int]

        do
                return [
                                -1, 3, 394 ,
                                26, 0, 497 
                        ]
        end
        do
                return [
                                -1, 3, 394 ,
                                26, 0, 497 
                        ]
        end

-       private meth action_table_row396: Array[Int]
+       private fun action_table_row396: Array[Int]

        do
                return [
                                -1, 3, 395 ,
                                16, 0, 498 
                        ]
        end
        do
                return [
                                -1, 3, 395 ,
                                16, 0, 498 
                        ]
        end

-       private meth action_table_row397: Array[Int]
+       private fun action_table_row397: Array[Int]

        do
                return [
                                -1, 3, 396 ,
                                30, 0, 499 
                        ]
        end
        do
                return [
                                -1, 3, 396 ,
                                30, 0, 499 
                        ]
        end

-       private meth action_table_row398: Array[Int]
+       private fun action_table_row398: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5625,13 +5625,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row399: Array[Int]
+       private fun action_table_row399: Array[Int]

        do
                return [
                                -1, 1, 386 
                        ]
        end
        do
                return [
                                -1, 1, 386 
                        ]
        end

-       private meth action_table_row400: Array[Int]
+       private fun action_table_row400: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -5639,13 +5639,13 @@ abstract class ParserTable
                                63, 0, 424 
                        ]
        end
                                63, 0, 424 
                        ]
        end

-       private meth action_table_row401: Array[Int]
+       private fun action_table_row401: Array[Int]

        do
                return [
                                -1, 1, 406 
                        ]
        end
        do
                return [
                                -1, 1, 406 
                        ]
        end

-       private meth action_table_row402: Array[Int]
+       private fun action_table_row402: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -5653,19 +5653,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row403: Array[Int]
+       private fun action_table_row403: Array[Int]

        do
                return [
                                -1, 1, 405 
                        ]
        end
        do
                return [
                                -1, 1, 405 
                        ]
        end

-       private meth action_table_row404: Array[Int]
+       private fun action_table_row404: Array[Int]

        do
                return [
                                -1, 1, 378 
                        ]
        end
        do
                return [
                                -1, 1, 378 
                        ]
        end

-       private meth action_table_row405: Array[Int]
+       private fun action_table_row405: Array[Int]

        do
                return [
                                -1, 3, 404 ,
        do
                return [
                                -1, 3, 404 ,

@@ -5692,7 +5692,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row406: Array[Int]
+       private fun action_table_row406: Array[Int]

        do
                return [
                                -1, 3, 405 ,
        do
                return [
                                -1, 3, 405 ,

@@ -5719,7 +5719,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row407: Array[Int]
+       private fun action_table_row407: Array[Int]

        do
                return [
                                -1, 3, 406 ,
        do
                return [
                                -1, 3, 406 ,

@@ -5745,7 +5745,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row408: Array[Int]
+       private fun action_table_row408: Array[Int]

        do
                return [
                                -1, 3, 407 ,
        do
                return [
                                -1, 3, 407 ,

@@ -5753,7 +5753,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row409: Array[Int]
+       private fun action_table_row409: Array[Int]

        do
                return [
                                -1, 3, 408 ,
        do
                return [
                                -1, 3, 408 ,

@@ -5779,7 +5779,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row410: Array[Int]
+       private fun action_table_row410: Array[Int]

        do
                return [
                                -1, 3, 409 ,
        do
                return [
                                -1, 3, 409 ,

@@ -5805,7 +5805,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row411: Array[Int]
+       private fun action_table_row411: Array[Int]

        do
                return [
                                -1, 3, 410 ,
        do
                return [
                                -1, 3, 410 ,

@@ -5831,7 +5831,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row412: Array[Int]
+       private fun action_table_row412: Array[Int]

        do
                return [
                                -1, 3, 411 ,
        do
                return [
                                -1, 3, 411 ,

@@ -5857,7 +5857,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row413: Array[Int]
+       private fun action_table_row413: Array[Int]

        do
                return [
                                -1, 3, 412 ,
        do
                return [
                                -1, 3, 412 ,

@@ -5883,7 +5883,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row414: Array[Int]
+       private fun action_table_row414: Array[Int]

        do
                return [
                                -1, 3, 413 ,
        do
                return [
                                -1, 3, 413 ,

@@ -5909,7 +5909,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row415: Array[Int]
+       private fun action_table_row415: Array[Int]

        do
                return [
                                -1, 3, 414 ,
        do
                return [
                                -1, 3, 414 ,

@@ -5935,7 +5935,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row416: Array[Int]
+       private fun action_table_row416: Array[Int]

        do
                return [
                                -1, 3, 415 ,
        do
                return [
                                -1, 3, 415 ,

@@ -5961,7 +5961,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row417: Array[Int]
+       private fun action_table_row417: Array[Int]

        do
                return [
                                -1, 3, 416 ,
        do
                return [
                                -1, 3, 416 ,

@@ -5987,7 +5987,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row418: Array[Int]
+       private fun action_table_row418: Array[Int]

        do
                return [
                                -1, 3, 417 ,
        do
                return [
                                -1, 3, 417 ,

@@ -6013,7 +6013,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row419: Array[Int]
+       private fun action_table_row419: Array[Int]

        do
                return [
                                -1, 3, 418 ,
        do
                return [
                                -1, 3, 418 ,

@@ -6039,7 +6039,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row420: Array[Int]
+       private fun action_table_row420: Array[Int]

        do
                return [
                                -1, 3, 419 ,
        do
                return [
                                -1, 3, 419 ,

@@ -6065,7 +6065,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row421: Array[Int]
+       private fun action_table_row421: Array[Int]

        do
                return [
                                -1, 3, 420 ,
        do
                return [
                                -1, 3, 420 ,

@@ -6075,20 +6075,20 @@ abstract class ParserTable
                                78, 0, 521 
                        ]
        end
                                78, 0, 521 
                        ]
        end

-       private meth action_table_row422: Array[Int]
+       private fun action_table_row422: Array[Int]

        do
                return [
                                -1, 1, 379 
                        ]
        end
        do
                return [
                                -1, 1, 379 
                        ]
        end

-       private meth action_table_row423: Array[Int]
+       private fun action_table_row423: Array[Int]

        do
                return [
                                -1, 1, 301 ,
                                53, 0, 522 
                        ]
        end
        do
                return [
                                -1, 1, 301 ,
                                53, 0, 522 
                        ]
        end

-       private meth action_table_row424: Array[Int]
+       private fun action_table_row424: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6096,7 +6096,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row425: Array[Int]
+       private fun action_table_row425: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6104,7 +6104,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row426: Array[Int]
+       private fun action_table_row426: Array[Int]

        do
                return [
                                -1, 3, 425 ,
        do
                return [
                                -1, 3, 425 ,

@@ -6114,7 +6114,7 @@ abstract class ParserTable
                                78, 0, 521 
                        ]
        end
                                78, 0, 521 
                        ]
        end

-       private meth action_table_row427: Array[Int]
+       private fun action_table_row427: Array[Int]

        do
                return [
                                -1, 3, 426 ,
        do
                return [
                                -1, 3, 426 ,

@@ -6123,19 +6123,19 @@ abstract class ParserTable
                                62, 0, 528 
                        ]
        end
                                62, 0, 528 
                        ]
        end

-       private meth action_table_row428: Array[Int]
+       private fun action_table_row428: Array[Int]

        do
                return [
                                -1, 1, 353 
                        ]
        end
        do
                return [
                                -1, 1, 353 
                        ]
        end

-       private meth action_table_row429: Array[Int]
+       private fun action_table_row429: Array[Int]

        do
                return [
                                -1, 1, 358 
                        ]
        end
        do
                return [
                                -1, 1, 358 
                        ]
        end

-       private meth action_table_row430: Array[Int]
+       private fun action_table_row430: Array[Int]

        do
                return [
                                -1, 3, 429 ,
        do
                return [
                                -1, 3, 429 ,

@@ -6171,13 +6171,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row431: Array[Int]
+       private fun action_table_row431: Array[Int]

        do
                return [
                                -1, 1, 455 
                        ]
        end
        do
                return [
                                -1, 1, 455 
                        ]
        end

-       private meth action_table_row432: Array[Int]
+       private fun action_table_row432: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6186,13 +6186,13 @@ abstract class ParserTable
                                16, 0, 533 
                        ]
        end
                                16, 0, 533 
                        ]
        end

-       private meth action_table_row433: Array[Int]
+       private fun action_table_row433: Array[Int]

        do
                return [
                                -1, 1, 337 
                        ]
        end
        do
                return [
                                -1, 1, 337 
                        ]
        end

-       private meth action_table_row434: Array[Int]
+       private fun action_table_row434: Array[Int]

        do
                return [
                                -1, 3, 433 ,
        do
                return [
                                -1, 3, 433 ,

@@ -6200,7 +6200,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row435: Array[Int]
+       private fun action_table_row435: Array[Int]

        do
                return [
                                -1, 3, 434 ,
        do
                return [
                                -1, 3, 434 ,

@@ -6208,20 +6208,20 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row436: Array[Int]
+       private fun action_table_row436: Array[Int]

        do
                return [
                                -1, 1, 272 ,
                                58, 0, 537 
                        ]
        end
        do
                return [
                                -1, 1, 272 ,
                                58, 0, 537 
                        ]
        end

-       private meth action_table_row437: Array[Int]
+       private fun action_table_row437: Array[Int]

        do
                return [
                                -1, 1, 274 
                        ]
        end
        do
                return [
                                -1, 1, 274 
                        ]
        end

-       private meth action_table_row438: Array[Int]
+       private fun action_table_row438: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6229,7 +6229,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row439: Array[Int]
+       private fun action_table_row439: Array[Int]

        do
                return [
                                -1, 3, 438 ,
        do
                return [
                                -1, 3, 438 ,

@@ -6237,7 +6237,7 @@ abstract class ParserTable
                                16, 0, 540 
                        ]
        end
                                16, 0, 540 
                        ]
        end

-       private meth action_table_row440: Array[Int]
+       private fun action_table_row440: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6246,13 +6246,13 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row441: Array[Int]
+       private fun action_table_row441: Array[Int]

        do
                return [
                                -1, 1, 276 
                        ]
        end
        do
                return [
                                -1, 1, 276 
                        ]
        end

-       private meth action_table_row442: Array[Int]
+       private fun action_table_row442: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6260,14 +6260,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row443: Array[Int]
+       private fun action_table_row443: Array[Int]

        do
                return [
                                -1, 1, 280 ,
                                48, 0, 546 
                        ]
        end
        do
                return [
                                -1, 1, 280 ,
                                48, 0, 546 
                        ]
        end

-       private meth action_table_row444: Array[Int]
+       private fun action_table_row444: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6276,7 +6276,7 @@ abstract class ParserTable
                                53, 0, 549 
                        ]
        end
                                53, 0, 549 
                        ]
        end

-       private meth action_table_row445: Array[Int]
+       private fun action_table_row445: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6284,7 +6284,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row446: Array[Int]
+       private fun action_table_row446: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -6313,7 +6313,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row447: Array[Int]
+       private fun action_table_row447: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6321,7 +6321,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row448: Array[Int]
+       private fun action_table_row448: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -6353,7 +6353,7 @@ abstract class ParserTable
                                86, 1, 451 
                        ]
        end
                                86, 1, 451 
                        ]
        end

-       private meth action_table_row449: Array[Int]
+       private fun action_table_row449: Array[Int]

        do
                return [
                                -1, 1, 411 ,
        do
                return [
                                -1, 1, 411 ,

@@ -6362,19 +6362,19 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row450: Array[Int]
+       private fun action_table_row450: Array[Int]

        do
                return [
                                -1, 1, 354 
                        ]
        end
        do
                return [
                                -1, 1, 354 
                        ]
        end

-       private meth action_table_row451: Array[Int]
+       private fun action_table_row451: Array[Int]

        do
                return [
                                -1, 1, 359 
                        ]
        end
        do
                return [
                                -1, 1, 359 
                        ]
        end

-       private meth action_table_row452: Array[Int]
+       private fun action_table_row452: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6382,32 +6382,32 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row453: Array[Int]
+       private fun action_table_row453: Array[Int]

        do
                return [
                                -1, 1, 438 
                        ]
        end
        do
                return [
                                -1, 1, 438 
                        ]
        end

-       private meth action_table_row454: Array[Int]
+       private fun action_table_row454: Array[Int]

        do
                return [
                                -1, 3, 453 ,
                                10, 0, 254 
                        ]
        end
        do
                return [
                                -1, 3, 453 ,
                                10, 0, 254 
                        ]
        end

-       private meth action_table_row455: Array[Int]
+       private fun action_table_row455: Array[Int]

        do
                return [
                                -1, 1, 37 
                        ]
        end
        do
                return [
                                -1, 1, 37 
                        ]
        end

-       private meth action_table_row456: Array[Int]
+       private fun action_table_row456: Array[Int]

        do
                return [
                                -1, 1, 44 
                        ]
        end
        do
                return [
                                -1, 1, 44 
                        ]
        end

-       private meth action_table_row457: Array[Int]
+       private fun action_table_row457: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6416,25 +6416,25 @@ abstract class ParserTable
                                86, 1, 21 
                        ]
        end
                                86, 1, 21 
                        ]
        end

-       private meth action_table_row458: Array[Int]
+       private fun action_table_row458: Array[Int]

        do
                return [
                                -1, 1, 41 
                        ]
        end
        do
                return [
                                -1, 1, 41 
                        ]
        end

-       private meth action_table_row459: Array[Int]
+       private fun action_table_row459: Array[Int]

        do
                return [
                                -1, 1, 39 
                        ]
        end
        do
                return [
                                -1, 1, 39 
                        ]
        end

-       private meth action_table_row460: Array[Int]
+       private fun action_table_row460: Array[Int]

        do
                return [
                                -1, 1, 46 
                        ]
        end
        do
                return [
                                -1, 1, 46 
                        ]
        end

-       private meth action_table_row461: Array[Int]
+       private fun action_table_row461: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6443,19 +6443,19 @@ abstract class ParserTable
                                86, 1, 23 
                        ]
        end
                                86, 1, 23 
                        ]
        end

-       private meth action_table_row462: Array[Int]
+       private fun action_table_row462: Array[Int]

        do
                return [
                                -1, 1, 43 
                        ]
        end
        do
                return [
                                -1, 1, 43 
                        ]
        end

-       private meth action_table_row463: Array[Int]
+       private fun action_table_row463: Array[Int]

        do
                return [
                                -1, 1, 445 
                        ]
        end
        do
                return [
                                -1, 1, 445 
                        ]
        end

-       private meth action_table_row464: Array[Int]
+       private fun action_table_row464: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6463,14 +6463,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row465: Array[Int]
+       private fun action_table_row465: Array[Int]

        do
                return [
                                -1, 3, 464 ,
                                26, 0, 567 
                        ]
        end
        do
                return [
                                -1, 3, 464 ,
                                26, 0, 567 
                        ]
        end

-       private meth action_table_row466: Array[Int]
+       private fun action_table_row466: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6478,20 +6478,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row467: Array[Int]
+       private fun action_table_row467: Array[Int]

        do
                return [
                                -1, 1, 627 
                        ]
        end
        do
                return [
                                -1, 1, 627 
                        ]
        end

-       private meth action_table_row468: Array[Int]
+       private fun action_table_row468: Array[Int]

        do
                return [
                                -1, 3, 467 ,
                                63, 0, 465 
                        ]
        end
        do
                return [
                                -1, 3, 467 ,
                                63, 0, 465 
                        ]
        end

-       private meth action_table_row469: Array[Int]
+       private fun action_table_row469: Array[Int]

        do
                return [
                                -1, 3, 468 ,
        do
                return [
                                -1, 3, 468 ,

@@ -6501,7 +6501,7 @@ abstract class ParserTable
                                78, 0, 569 
                        ]
        end
                                78, 0, 569 
                        ]
        end

-       private meth action_table_row470: Array[Int]
+       private fun action_table_row470: Array[Int]

        do
                return [
                                -1, 3, 469 ,
        do
                return [
                                -1, 3, 469 ,

@@ -6509,19 +6509,19 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row471: Array[Int]
+       private fun action_table_row471: Array[Int]

        do
                return [
                                -1, 1, 603 
                        ]
        end
        do
                return [
                                -1, 1, 603 
                        ]
        end

-       private meth action_table_row472: Array[Int]
+       private fun action_table_row472: Array[Int]

        do
                return [
                                -1, 1, 602 
                        ]
        end
        do
                return [
                                -1, 1, 602 
                        ]
        end

-       private meth action_table_row473: Array[Int]
+       private fun action_table_row473: Array[Int]

        do
                return [
                                -1, 1, 608 ,
        do
                return [
                                -1, 1, 608 ,

@@ -6529,13 +6529,13 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row474: Array[Int]
+       private fun action_table_row474: Array[Int]

        do
                return [
                                -1, 1, 615 
                        ]
        end
        do
                return [
                                -1, 1, 615 
                        ]
        end

-       private meth action_table_row475: Array[Int]
+       private fun action_table_row475: Array[Int]

        do
                return [
                                -1, 1, 617 ,
        do
                return [
                                -1, 1, 617 ,

@@ -6544,7 +6544,7 @@ abstract class ParserTable
                                68, 0, 252 
                        ]
        end
                                68, 0, 252 
                        ]
        end

-       private meth action_table_row476: Array[Int]
+       private fun action_table_row476: Array[Int]

        do
                return [
                                -1, 1, 618 ,
        do
                return [
                                -1, 1, 618 ,

@@ -6553,7 +6553,7 @@ abstract class ParserTable
                                68, 0, 252 
                        ]
        end
                                68, 0, 252 
                        ]
        end

-       private meth action_table_row477: Array[Int]
+       private fun action_table_row477: Array[Int]

        do
                return [
                                -1, 1, 607 ,
        do
                return [
                                -1, 1, 607 ,

@@ -6561,7 +6561,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row478: Array[Int]
+       private fun action_table_row478: Array[Int]

        do
                return [
                                -1, 1, 609 ,
        do
                return [
                                -1, 1, 609 ,

@@ -6569,7 +6569,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row479: Array[Int]
+       private fun action_table_row479: Array[Int]

        do
                return [
                                -1, 1, 610 ,
        do
                return [
                                -1, 1, 610 ,

@@ -6577,7 +6577,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row480: Array[Int]
+       private fun action_table_row480: Array[Int]

        do
                return [
                                -1, 1, 611 ,
        do
                return [
                                -1, 1, 611 ,

@@ -6585,7 +6585,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row481: Array[Int]
+       private fun action_table_row481: Array[Int]

        do
                return [
                                -1, 1, 612 ,
        do
                return [
                                -1, 1, 612 ,

@@ -6593,7 +6593,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row482: Array[Int]
+       private fun action_table_row482: Array[Int]

        do
                return [
                                -1, 1, 613 ,
        do
                return [
                                -1, 1, 613 ,

@@ -6601,7 +6601,7 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row483: Array[Int]
+       private fun action_table_row483: Array[Int]

        do
                return [
                                -1, 1, 614 ,
        do
                return [
                                -1, 1, 614 ,

@@ -6609,32 +6609,32 @@ abstract class ParserTable
                                65, 0, 242 
                        ]
        end
                                65, 0, 242 
                        ]
        end

-       private meth action_table_row484: Array[Int]
+       private fun action_table_row484: Array[Int]

        do
                return [
                                -1, 1, 620 
                        ]
        end
        do
                return [
                                -1, 1, 620 
                        ]
        end

-       private meth action_table_row485: Array[Int]
+       private fun action_table_row485: Array[Int]

        do
                return [
                                -1, 1, 621 
                        ]
        end
        do
                return [
                                -1, 1, 621 
                        ]
        end

-       private meth action_table_row486: Array[Int]
+       private fun action_table_row486: Array[Int]

        do
                return [
                                -1, 1, 622 
                        ]
        end
        do
                return [
                                -1, 1, 622 
                        ]
        end

-       private meth action_table_row487: Array[Int]
+       private fun action_table_row487: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row488: Array[Int]
+       private fun action_table_row488: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6642,20 +6642,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row489: Array[Int]
+       private fun action_table_row489: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row490: Array[Int]
+       private fun action_table_row490: Array[Int]

        do
                return [
                                -1, 1, 630 
                        ]
        end
        do
                return [
                                -1, 1, 630 
                        ]
        end

-       private meth action_table_row491: Array[Int]
+       private fun action_table_row491: Array[Int]

        do
                return [
                                -1, 3, 490 ,
        do
                return [
                                -1, 3, 490 ,

@@ -6663,7 +6663,7 @@ abstract class ParserTable
                                16, 0, 576 
                        ]
        end
                                16, 0, 576 
                        ]
        end

-       private meth action_table_row492: Array[Int]
+       private fun action_table_row492: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6672,13 +6672,13 @@ abstract class ParserTable
                                53, 0, 549 
                        ]
        end
                                53, 0, 549 
                        ]
        end

-       private meth action_table_row493: Array[Int]
+       private fun action_table_row493: Array[Int]

        do
                return [
                                -1, 1, 309 
                        ]
        end
        do
                return [
                                -1, 1, 309 
                        ]
        end

-       private meth action_table_row494: Array[Int]
+       private fun action_table_row494: Array[Int]

        do
                return [
                                -1, 3, 493 ,
        do
                return [
                                -1, 3, 493 ,

@@ -6712,19 +6712,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row495: Array[Int]
+       private fun action_table_row495: Array[Int]

        do
                return [
                                -1, 1, 307 
                        ]
        end
        do
                return [
                                -1, 1, 307 
                        ]
        end

-       private meth action_table_row496: Array[Int]
+       private fun action_table_row496: Array[Int]

        do
                return [
                                -1, 1, 348 
                        ]
        end
        do
                return [
                                -1, 1, 348 
                        ]
        end

-       private meth action_table_row497: Array[Int]
+       private fun action_table_row497: Array[Int]

        do
                return [
                                -1, 3, 496 ,
        do
                return [
                                -1, 3, 496 ,

@@ -6752,7 +6752,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row498: Array[Int]
+       private fun action_table_row498: Array[Int]

        do
                return [
                                -1, 3, 497 ,
        do
                return [
                                -1, 3, 497 ,

@@ -6789,7 +6789,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row499: Array[Int]
+       private fun action_table_row499: Array[Int]

        do
                return [
                                -1, 3, 498 ,
        do
                return [
                                -1, 3, 498 ,

@@ -6825,7 +6825,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row500: Array[Int]
+       private fun action_table_row500: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -6833,20 +6833,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row501: Array[Int]
+       private fun action_table_row501: Array[Int]

        do
                return [
                                -1, 3, 500 ,
                                26, 0, 614 
                        ]
        end
        do
                return [
                                -1, 3, 500 ,
                                26, 0, 614 
                        ]
        end

-       private meth action_table_row502: Array[Int]
+       private fun action_table_row502: Array[Int]

        do
                return [
                                -1, 1, 408 
                        ]
        end
        do
                return [
                                -1, 1, 408 
                        ]
        end

-       private meth action_table_row503: Array[Int]
+       private fun action_table_row503: Array[Int]

        do
                return [
                                -1, 3, 502 ,
        do
                return [
                                -1, 3, 502 ,

@@ -6856,19 +6856,19 @@ abstract class ParserTable
                                78, 0, 615 
                        ]
        end
                                78, 0, 615 
                        ]
        end

-       private meth action_table_row504: Array[Int]
+       private fun action_table_row504: Array[Int]

        do
                return [
                                -1, 1, 384 
                        ]
        end
        do
                return [
                                -1, 1, 384 
                        ]
        end

-       private meth action_table_row505: Array[Int]
+       private fun action_table_row505: Array[Int]

        do
                return [
                                -1, 1, 383 
                        ]
        end
        do
                return [
                                -1, 1, 383 
                        ]
        end

-       private meth action_table_row506: Array[Int]
+       private fun action_table_row506: Array[Int]

        do
                return [
                                -1, 1, 389 ,
        do
                return [
                                -1, 1, 389 ,

@@ -6876,13 +6876,13 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row507: Array[Int]
+       private fun action_table_row507: Array[Int]

        do
                return [
                                -1, 1, 396 
                        ]
        end
        do
                return [
                                -1, 1, 396 
                        ]
        end

-       private meth action_table_row508: Array[Int]
+       private fun action_table_row508: Array[Int]

        do
                return [
                                -1, 1, 398 ,
        do
                return [
                                -1, 1, 398 ,

@@ -6891,7 +6891,7 @@ abstract class ParserTable
                                68, 0, 287 
                        ]
        end
                                68, 0, 287 
                        ]
        end

-       private meth action_table_row509: Array[Int]
+       private fun action_table_row509: Array[Int]

        do
                return [
                                -1, 1, 399 ,
        do
                return [
                                -1, 1, 399 ,

@@ -6900,7 +6900,7 @@ abstract class ParserTable
                                68, 0, 287 
                        ]
        end
                                68, 0, 287 
                        ]
        end

-       private meth action_table_row510: Array[Int]
+       private fun action_table_row510: Array[Int]

        do
                return [
                                -1, 1, 388 ,
        do
                return [
                                -1, 1, 388 ,

@@ -6908,7 +6908,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row511: Array[Int]
+       private fun action_table_row511: Array[Int]

        do
                return [
                                -1, 1, 390 ,
        do
                return [
                                -1, 1, 390 ,

@@ -6916,7 +6916,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row512: Array[Int]
+       private fun action_table_row512: Array[Int]

        do
                return [
                                -1, 1, 391 ,
        do
                return [
                                -1, 1, 391 ,

@@ -6924,7 +6924,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row513: Array[Int]
+       private fun action_table_row513: Array[Int]

        do
                return [
                                -1, 1, 392 ,
        do
                return [
                                -1, 1, 392 ,

@@ -6932,7 +6932,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row514: Array[Int]
+       private fun action_table_row514: Array[Int]

        do
                return [
                                -1, 1, 393 ,
        do
                return [
                                -1, 1, 393 ,

@@ -6940,7 +6940,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row515: Array[Int]
+       private fun action_table_row515: Array[Int]

        do
                return [
                                -1, 1, 394 ,
        do
                return [
                                -1, 1, 394 ,

@@ -6948,7 +6948,7 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row516: Array[Int]
+       private fun action_table_row516: Array[Int]

        do
                return [
                                -1, 1, 395 ,
        do
                return [
                                -1, 1, 395 ,

@@ -6956,45 +6956,45 @@ abstract class ParserTable
                                65, 0, 277 
                        ]
        end
                                65, 0, 277 
                        ]
        end

-       private meth action_table_row517: Array[Int]
+       private fun action_table_row517: Array[Int]

        do
                return [
                                -1, 1, 401 
                        ]
        end
        do
                return [
                                -1, 1, 401 
                        ]
        end

-       private meth action_table_row518: Array[Int]
+       private fun action_table_row518: Array[Int]

        do
                return [
                                -1, 1, 402 
                        ]
        end
        do
                return [
                                -1, 1, 402 
                        ]
        end

-       private meth action_table_row519: Array[Int]
+       private fun action_table_row519: Array[Int]

        do
                return [
                                -1, 1, 403 
                        ]
        end
        do
                return [
                                -1, 1, 403 
                        ]
        end

-       private meth action_table_row520: Array[Int]
+       private fun action_table_row520: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row521: Array[Int]
+       private fun action_table_row521: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row522: Array[Int]
+       private fun action_table_row522: Array[Int]

        do
                return [
                                -1, 1, 411 
                        ]
        end
        do
                return [
                                -1, 1, 411 
                        ]
        end

-       private meth action_table_row523: Array[Int]
+       private fun action_table_row523: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7002,7 +7002,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row524: Array[Int]
+       private fun action_table_row524: Array[Int]

        do
                return [
                                -1, 3, 523 ,
        do
                return [
                                -1, 3, 523 ,

@@ -7010,27 +7010,27 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row525: Array[Int]
+       private fun action_table_row525: Array[Int]

        do
                return [
                                -1, 3, 524 ,
                                77, 0, 620 
                        ]
        end
        do
                return [
                                -1, 3, 524 ,
                                77, 0, 620 
                        ]
        end

-       private meth action_table_row526: Array[Int]
+       private fun action_table_row526: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row527: Array[Int]
+       private fun action_table_row527: Array[Int]

        do
                return [
                                -1, 1, 452 
                        ]
        end
        do
                return [
                                -1, 1, 452 
                        ]
        end

-       private meth action_table_row528: Array[Int]
+       private fun action_table_row528: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7038,7 +7038,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row529: Array[Int]
+       private fun action_table_row529: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7046,13 +7046,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row530: Array[Int]
+       private fun action_table_row530: Array[Int]

        do
                return [
                                -1, 1, 728 
                        ]
        end
        do
                return [
                                -1, 1, 728 
                        ]
        end

-       private meth action_table_row531: Array[Int]
+       private fun action_table_row531: Array[Int]

        do
                return [
                                -1, 3, 530 ,
        do
                return [
                                -1, 3, 530 ,

@@ -7060,13 +7060,13 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row532: Array[Int]
+       private fun action_table_row532: Array[Int]

        do
                return [
                                -1, 1, 338 
                        ]
        end
        do
                return [
                                -1, 1, 338 
                        ]
        end

-       private meth action_table_row533: Array[Int]
+       private fun action_table_row533: Array[Int]

        do
                return [
                                -1, 1, 344 ,
        do
                return [
                                -1, 1, 344 ,

@@ -7100,7 +7100,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row534: Array[Int]
+       private fun action_table_row534: Array[Int]

        do
                return [
                                -1, 3, 533 ,
        do
                return [
                                -1, 3, 533 ,

@@ -7136,32 +7136,32 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row535: Array[Int]
+       private fun action_table_row535: Array[Int]

        do
                return [
                                -1, 3, 534 ,
                                55, 0, 629 
                        ]
        end
        do
                return [
                                -1, 3, 534 ,
                                55, 0, 629 
                        ]
        end

-       private meth action_table_row536: Array[Int]
+       private fun action_table_row536: Array[Int]

        do
                return [
                                -1, 1, 50 
                        ]
        end
        do
                return [
                                -1, 1, 50 
                        ]
        end

-       private meth action_table_row537: Array[Int]
+       private fun action_table_row537: Array[Int]

        do
                return [
                                -1, 1, 49 
                        ]
        end
        do
                return [
                                -1, 1, 49 
                        ]
        end

-       private meth action_table_row538: Array[Int]
+       private fun action_table_row538: Array[Int]

        do
                return [
                                -1, 1, 275 
                        ]
        end
        do
                return [
                                -1, 1, 275 
                        ]
        end

-       private meth action_table_row539: Array[Int]
+       private fun action_table_row539: Array[Int]

        do
                return [
                                -1, 3, 538 ,
        do
                return [
                                -1, 3, 538 ,

@@ -7169,14 +7169,14 @@ abstract class ParserTable
                                77, 0, 631 
                        ]
        end
                                77, 0, 631 
                        ]
        end

-       private meth action_table_row540: Array[Int]
+       private fun action_table_row540: Array[Int]

        do
                return [
                                -1, 3, 539 ,
                                21, 0, 633 
                        ]
        end
        do
                return [
                                -1, 3, 539 ,
                                21, 0, 633 
                        ]
        end

-       private meth action_table_row541: Array[Int]
+       private fun action_table_row541: Array[Int]

        do
                return [
                                -1, 3, 540 ,
        do
                return [
                                -1, 3, 540 ,

@@ -7212,13 +7212,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row542: Array[Int]
+       private fun action_table_row542: Array[Int]

        do
                return [
                                -1, 1, 277 
                        ]
        end
        do
                return [
                                -1, 1, 277 
                        ]
        end

-       private meth action_table_row543: Array[Int]
+       private fun action_table_row543: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7226,27 +7226,27 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row544: Array[Int]
+       private fun action_table_row544: Array[Int]

        do
                return [
                                -1, 1, 281 ,
                                48, 0, 546 
                        ]
        end
        do
                return [
                                -1, 1, 281 ,
                                48, 0, 546 
                        ]
        end

-       private meth action_table_row545: Array[Int]
+       private fun action_table_row545: Array[Int]

        do
                return [
                                -1, 1, 278 
                        ]
        end
        do
                return [
                                -1, 1, 278 
                        ]
        end

-       private meth action_table_row546: Array[Int]
+       private fun action_table_row546: Array[Int]

        do
                return [
                                -1, 1, 282 ,
                                48, 0, 546 
                        ]
        end
        do
                return [
                                -1, 1, 282 ,
                                48, 0, 546 
                        ]
        end

-       private meth action_table_row547: Array[Int]
+       private fun action_table_row547: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7255,20 +7255,20 @@ abstract class ParserTable
                                36, 0, 637 
                        ]
        end
                                36, 0, 637 
                        ]
        end

-       private meth action_table_row548: Array[Int]
+       private fun action_table_row548: Array[Int]

        do
                return [
                                -1, 1, 720 
                        ]
        end
        do
                return [
                                -1, 1, 720 
                        ]
        end

-       private meth action_table_row549: Array[Int]
+       private fun action_table_row549: Array[Int]

        do
                return [
                                -1, 1, 295 ,
                                48, 0, 546 
                        ]
        end
        do
                return [
                                -1, 1, 295 ,
                                48, 0, 546 
                        ]
        end

-       private meth action_table_row550: Array[Int]
+       private fun action_table_row550: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7276,7 +7276,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row551: Array[Int]
+       private fun action_table_row551: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7284,13 +7284,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row552: Array[Int]
+       private fun action_table_row552: Array[Int]

        do
                return [
                                -1, 1, 712 
                        ]
        end
        do
                return [
                                -1, 1, 712 
                        ]
        end

-       private meth action_table_row553: Array[Int]
+       private fun action_table_row553: Array[Int]

        do
                return [
                                -1, 3, 552 ,
        do
                return [
                                -1, 3, 552 ,

@@ -7298,7 +7298,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row554: Array[Int]
+       private fun action_table_row554: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -7312,7 +7312,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row555: Array[Int]
+       private fun action_table_row555: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7320,7 +7320,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row556: Array[Int]
+       private fun action_table_row556: Array[Int]

        do
                return [
                                -1, 3, 555 ,
        do
                return [
                                -1, 3, 555 ,

@@ -7328,26 +7328,26 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row557: Array[Int]
+       private fun action_table_row557: Array[Int]

        do
                return [
                                -1, 1, 417 
                        ]
        end
        do
                return [
                                -1, 1, 417 
                        ]
        end

-       private meth action_table_row558: Array[Int]
+       private fun action_table_row558: Array[Int]

        do
                return [
                                -1, 1, 334 
                        ]
        end
        do
                return [
                                -1, 1, 334 
                        ]
        end

-       private meth action_table_row559: Array[Int]
+       private fun action_table_row559: Array[Int]

        do
                return [
                                -1, 3, 558 ,
                                51, 0, 654 
                        ]
        end
        do
                return [
                                -1, 3, 558 ,
                                51, 0, 654 
                        ]
        end

-       private meth action_table_row560: Array[Int]
+       private fun action_table_row560: Array[Int]

        do
                return [
                                -1, 1, 413 ,
        do
                return [
                                -1, 1, 413 ,

@@ -7356,14 +7356,14 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row561: Array[Int]
+       private fun action_table_row561: Array[Int]

        do
                return [
                                -1, 1, 328 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 1, 328 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row562: Array[Int]
+       private fun action_table_row562: Array[Int]

        do
                return [
                                -1, 3, 561 ,
        do
                return [
                                -1, 3, 561 ,

@@ -7391,7 +7391,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row563: Array[Int]
+       private fun action_table_row563: Array[Int]

        do
                return [
                                -1, 3, 562 ,
        do
                return [
                                -1, 3, 562 ,

@@ -7419,25 +7419,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row564: Array[Int]
+       private fun action_table_row564: Array[Int]

        do
                return [
                                -1, 1, 440 
                        ]
        end
        do
                return [
                                -1, 1, 440 
                        ]
        end

-       private meth action_table_row565: Array[Int]
+       private fun action_table_row565: Array[Int]

        do
                return [
                                -1, 1, 45 
                        ]
        end
        do
                return [
                                -1, 1, 45 
                        ]
        end

-       private meth action_table_row566: Array[Int]
+       private fun action_table_row566: Array[Int]

        do
                return [
                                -1, 1, 47 
                        ]
        end
        do
                return [
                                -1, 1, 47 
                        ]
        end

-       private meth action_table_row567: Array[Int]
+       private fun action_table_row567: Array[Int]

        do
                return [
                                -1, 3, 566 ,
        do
                return [
                                -1, 3, 566 ,

@@ -7445,7 +7445,7 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row568: Array[Int]
+       private fun action_table_row568: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7453,21 +7453,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row569: Array[Int]
+       private fun action_table_row569: Array[Int]

        do
                return [
                                -1, 3, 568 ,
                                77, 0, 663 
                        ]
        end
        do
                return [
                                -1, 3, 568 ,
                                77, 0, 663 
                        ]
        end

-       private meth action_table_row570: Array[Int]
+       private fun action_table_row570: Array[Int]

        do
                return [
                                -1, 1, 628 ,
                                63, 1, 630 
                        ]
        end
        do
                return [
                                -1, 1, 628 ,
                                63, 1, 630 
                        ]
        end

-       private meth action_table_row571: Array[Int]
+       private fun action_table_row571: Array[Int]

        do
                return [
                                -1, 1, 447 ,
        do
                return [
                                -1, 1, 447 ,

@@ -7478,7 +7478,7 @@ abstract class ParserTable
                                63, 1, 443 
                        ]
        end
                                63, 1, 443 
                        ]
        end

-       private meth action_table_row572: Array[Int]
+       private fun action_table_row572: Array[Int]

        do
                return [
                                -1, 3, 571 ,
        do
                return [
                                -1, 3, 571 ,

@@ -7486,33 +7486,33 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row573: Array[Int]
+       private fun action_table_row573: Array[Int]

        do
                return [
                                -1, 1, 636 
                        ]
        end
        do
                return [
                                -1, 1, 636 
                        ]
        end

-       private meth action_table_row574: Array[Int]
+       private fun action_table_row574: Array[Int]

        do
                return [
                                -1, 3, 573 ,
                                51, 0, 665 
                        ]
        end
        do
                return [
                                -1, 3, 573 ,
                                51, 0, 665 
                        ]
        end

-       private meth action_table_row575: Array[Int]
+       private fun action_table_row575: Array[Int]

        do
                return [
                                -1, 1, 632 
                        ]
        end
        do
                return [
                                -1, 1, 632 
                        ]
        end

-       private meth action_table_row576: Array[Int]
+       private fun action_table_row576: Array[Int]

        do
                return [
                                -1, 3, 575 ,
                                21, 0, 666 
                        ]
        end
        do
                return [
                                -1, 3, 575 ,
                                21, 0, 666 
                        ]
        end

-       private meth action_table_row577: Array[Int]
+       private fun action_table_row577: Array[Int]

        do
                return [
                                -1, 3, 576 ,
        do
                return [
                                -1, 3, 576 ,

@@ -7548,7 +7548,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row578: Array[Int]
+       private fun action_table_row578: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7556,7 +7556,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row579: Array[Int]
+       private fun action_table_row579: Array[Int]

        do
                return [
                                -1, 3, 578 ,
        do
                return [
                                -1, 3, 578 ,

@@ -7564,7 +7564,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row580: Array[Int]
+       private fun action_table_row580: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -7578,7 +7578,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row581: Array[Int]
+       private fun action_table_row581: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7586,25 +7586,25 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row582: Array[Int]
+       private fun action_table_row582: Array[Int]

        do
                return [
                                -1, 1, 310 
                        ]
        end
        do
                return [
                                -1, 1, 310 
                        ]
        end

-       private meth action_table_row583: Array[Int]
+       private fun action_table_row583: Array[Int]

        do
                return [
                                -1, 1, 349 
                        ]
        end
        do
                return [
                                -1, 1, 349 
                        ]
        end

-       private meth action_table_row584: Array[Int]
+       private fun action_table_row584: Array[Int]

        do
                return [
                                -1, 1, 370 
                        ]
        end
        do
                return [
                                -1, 1, 370 
                        ]
        end

-       private meth action_table_row585: Array[Int]
+       private fun action_table_row585: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -7633,7 +7633,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row586: Array[Int]
+       private fun action_table_row586: Array[Int]

        do
                return [
                                -1, 3, 585 ,
        do
                return [
                                -1, 3, 585 ,

@@ -7669,14 +7669,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row587: Array[Int]
+       private fun action_table_row587: Array[Int]

        do
                return [
                                -1, 3, 586 ,
                                77, 0, 680 
                        ]
        end
        do
                return [
                                -1, 3, 586 ,
                                77, 0, 680 
                        ]
        end

-       private meth action_table_row588: Array[Int]
+       private fun action_table_row588: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7684,7 +7684,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row589: Array[Int]
+       private fun action_table_row589: Array[Int]

        do
                return [
                                -1, 3, 588 ,
        do
                return [
                                -1, 3, 588 ,

@@ -7720,7 +7720,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row590: Array[Int]
+       private fun action_table_row590: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7728,7 +7728,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row591: Array[Int]
+       private fun action_table_row591: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -7736,7 +7736,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row592: Array[Int]
+       private fun action_table_row592: Array[Int]

        do
                return [
                                -1, 1, 316 ,
        do
                return [
                                -1, 1, 316 ,

@@ -7765,7 +7765,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row593: Array[Int]
+       private fun action_table_row593: Array[Int]

        do
                return [
                                -1, 1, 321 ,
        do
                return [
                                -1, 1, 321 ,

@@ -7794,7 +7794,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row594: Array[Int]
+       private fun action_table_row594: Array[Int]

        do
                return [
                                -1, 1, 318 ,
        do
                return [
                                -1, 1, 318 ,

@@ -7823,14 +7823,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row595: Array[Int]
+       private fun action_table_row595: Array[Int]

        do
                return [
                                -1, 1, 320 ,
                                27, 1, 549 
                        ]
        end
        do
                return [
                                -1, 1, 320 ,
                                27, 1, 549 
                        ]
        end

-       private meth action_table_row596: Array[Int]
+       private fun action_table_row596: Array[Int]

        do
                return [
                                -1, 3, 595 ,
        do
                return [
                                -1, 3, 595 ,

@@ -7858,7 +7858,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row597: Array[Int]
+       private fun action_table_row597: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -7887,7 +7887,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row598: Array[Int]
+       private fun action_table_row598: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -7920,7 +7920,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row599: Array[Int]
+       private fun action_table_row599: Array[Int]

        do
                return [
                                -1, 1, 412 ,
        do
                return [
                                -1, 1, 412 ,

@@ -7929,19 +7929,19 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row600: Array[Int]
+       private fun action_table_row600: Array[Int]

        do
                return [
                                -1, 1, 364 
                        ]
        end
        do
                return [
                                -1, 1, 364 
                        ]
        end

-       private meth action_table_row601: Array[Int]
+       private fun action_table_row601: Array[Int]

        do
                return [
                                -1, 1, 367 
                        ]
        end
        do
                return [
                                -1, 1, 367 
                        ]
        end

-       private meth action_table_row602: Array[Int]
+       private fun action_table_row602: Array[Int]

        do
                return [
                                -1, 3, 601 ,
        do
                return [
                                -1, 3, 601 ,

@@ -7949,14 +7949,14 @@ abstract class ParserTable
                                63, 0, 699 
                        ]
        end
                                63, 0, 699 
                        ]
        end

-       private meth action_table_row603: Array[Int]
+       private fun action_table_row603: Array[Int]

        do
                return [
                                -1, 3, 602 ,
                                42, 0, 701 
                        ]
        end
        do
                return [
                                -1, 3, 602 ,
                                42, 0, 701 
                        ]
        end

-       private meth action_table_row604: Array[Int]
+       private fun action_table_row604: Array[Int]

        do
                return [
                                -1, 3, 603 ,
        do
                return [
                                -1, 3, 603 ,

@@ -7991,62 +7991,62 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row605: Array[Int]
+       private fun action_table_row605: Array[Int]

        do
                return [
                                -1, 3, 604 ,
                                27, 0, 704 
                        ]
        end
        do
                return [
                                -1, 3, 604 ,
                                27, 0, 704 
                        ]
        end

-       private meth action_table_row606: Array[Int]
+       private fun action_table_row606: Array[Int]

        do
                return [
                                -1, 1, 543 
                        ]
        end
        do
                return [
                                -1, 1, 543 
                        ]
        end

-       private meth action_table_row607: Array[Int]
+       private fun action_table_row607: Array[Int]

        do
                return [
                                -1, 1, 544 
                        ]
        end
        do
                return [
                                -1, 1, 544 
                        ]
        end

-       private meth action_table_row608: Array[Int]
+       private fun action_table_row608: Array[Int]

        do
                return [
                                -1, 1, 552 
                        ]
        end
        do
                return [
                                -1, 1, 552 
                        ]
        end

-       private meth action_table_row609: Array[Int]
+       private fun action_table_row609: Array[Int]

        do
                return [
                                -1, 1, 553 
                        ]
        end
        do
                return [
                                -1, 1, 553 
                        ]
        end

-       private meth action_table_row610: Array[Int]
+       private fun action_table_row610: Array[Int]

        do
                return [
                                -1, 1, 554 
                        ]
        end
        do
                return [
                                -1, 1, 554 
                        ]
        end

-       private meth action_table_row611: Array[Int]
+       private fun action_table_row611: Array[Int]

        do
                return [
                                -1, 1, 555 
                        ]
        end
        do
                return [
                                -1, 1, 555 
                        ]
        end

-       private meth action_table_row612: Array[Int]
+       private fun action_table_row612: Array[Int]

        do
                return [
                                -1, 1, 556 
                        ]
        end
        do
                return [
                                -1, 1, 556 
                        ]
        end

-       private meth action_table_row613: Array[Int]
+       private fun action_table_row613: Array[Int]

        do
                return [
                                -1, 1, 371 
                        ]
        end
        do
                return [
                                -1, 1, 371 
                        ]
        end

-       private meth action_table_row614: Array[Int]
+       private fun action_table_row614: Array[Int]

        do
                return [
                                -1, 3, 613 ,
        do
                return [
                                -1, 3, 613 ,

@@ -8074,7 +8074,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row615: Array[Int]
+       private fun action_table_row615: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8082,7 +8082,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row616: Array[Int]
+       private fun action_table_row616: Array[Int]

        do
                return [
                                -1, 1, 409 ,
        do
                return [
                                -1, 1, 409 ,

@@ -8090,14 +8090,14 @@ abstract class ParserTable
                                63, 1, 411 
                        ]
        end
                                63, 1, 411 
                        ]
        end

-       private meth action_table_row617: Array[Int]
+       private fun action_table_row617: Array[Int]

        do
                return [
                                -1, 1, 413 ,
                                48, 0, 305 
                        ]
        end
        do
                return [
                                -1, 1, 413 ,
                                48, 0, 305 
                        ]
        end

-       private meth action_table_row618: Array[Int]
+       private fun action_table_row618: Array[Int]

        do
                return [
                                -1, 3, 617 ,
        do
                return [
                                -1, 3, 617 ,

@@ -8105,14 +8105,14 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row619: Array[Int]
+       private fun action_table_row619: Array[Int]

        do
                return [
                                -1, 1, 304 ,
                                55, 0, 709 
                        ]
        end
        do
                return [
                                -1, 1, 304 ,
                                55, 0, 709 
                        ]
        end

-       private meth action_table_row620: Array[Int]
+       private fun action_table_row620: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8120,20 +8120,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row621: Array[Int]
+       private fun action_table_row621: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row622: Array[Int]
+       private fun action_table_row622: Array[Int]

        do
                return [
                                -1, 1, 413 
                        ]
        end
        do
                return [
                                -1, 1, 413 
                        ]
        end

-       private meth action_table_row623: Array[Int]
+       private fun action_table_row623: Array[Int]

        do
                return [
                                -1, 3, 622 ,
        do
                return [
                                -1, 3, 622 ,

@@ -8161,7 +8161,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row624: Array[Int]
+       private fun action_table_row624: Array[Int]

        do
                return [
                                -1, 3, 623 ,
        do
                return [
                                -1, 3, 623 ,

@@ -8188,19 +8188,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row625: Array[Int]
+       private fun action_table_row625: Array[Int]

        do
                return [
                                -1, 1, 453 
                        ]
        end
        do
                return [
                                -1, 1, 453 
                        ]
        end

-       private meth action_table_row626: Array[Int]
+       private fun action_table_row626: Array[Int]

        do
                return [
                                -1, 1, 729 
                        ]
        end
        do
                return [
                                -1, 1, 729 
                        ]
        end

-       private meth action_table_row627: Array[Int]
+       private fun action_table_row627: Array[Int]

        do
                return [
                                -1, 3, 626 ,
        do
                return [
                                -1, 3, 626 ,

@@ -8208,13 +8208,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row628: Array[Int]
+       private fun action_table_row628: Array[Int]

        do
                return [
                                -1, 1, 339 
                        ]
        end
        do
                return [
                                -1, 1, 339 
                        ]
        end

-       private meth action_table_row629: Array[Int]
+       private fun action_table_row629: Array[Int]

        do
                return [
                                -1, 1, 345 ,
        do
                return [
                                -1, 1, 345 ,

@@ -8248,7 +8248,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row630: Array[Int]
+       private fun action_table_row630: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8256,20 +8256,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row631: Array[Int]
+       private fun action_table_row631: Array[Int]

        do
                return [
                                -1, 1, 290 
                        ]
        end
        do
                return [
                                -1, 1, 290 
                        ]
        end

-       private meth action_table_row632: Array[Int]
+       private fun action_table_row632: Array[Int]

        do
                return [
                                -1, 1, 292 ,
                                56, 0, 258 
                        ]
        end
        do
                return [
                                -1, 1, 292 ,
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row633: Array[Int]
+       private fun action_table_row633: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8278,34 +8278,34 @@ abstract class ParserTable
                                55, 0, 750 
                        ]
        end
                                55, 0, 750 
                        ]
        end

-       private meth action_table_row634: Array[Int]
+       private fun action_table_row634: Array[Int]

        do
                return [
                                -1, 1, 477 ,
                                82, 0, 754 
                        ]
        end
        do
                return [
                                -1, 1, 477 ,
                                82, 0, 754 
                        ]
        end

-       private meth action_table_row635: Array[Int]
+       private fun action_table_row635: Array[Int]

        do
                return [
                                -1, 1, 473 ,
                                9, 0, 755 
                        ]
        end
        do
                return [
                                -1, 1, 473 ,
                                9, 0, 755 
                        ]
        end

-       private meth action_table_row636: Array[Int]
+       private fun action_table_row636: Array[Int]

        do
                return [
                                -1, 1, 279 
                        ]
        end
        do
                return [
                                -1, 1, 279 
                        ]
        end

-       private meth action_table_row637: Array[Int]
+       private fun action_table_row637: Array[Int]

        do
                return [
                                -1, 1, 283 ,
                                48, 0, 546 
                        ]
        end
        do
                return [
                                -1, 1, 283 ,
                                48, 0, 546 
                        ]
        end

-       private meth action_table_row638: Array[Int]
+       private fun action_table_row638: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8313,27 +8313,27 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row639: Array[Int]
+       private fun action_table_row639: Array[Int]

        do
                return [
                                -1, 3, 638 ,
                                77, 0, 757 
                        ]
        end
        do
                return [
                                -1, 3, 638 ,
                                77, 0, 757 
                        ]
        end

-       private meth action_table_row640: Array[Int]
+       private fun action_table_row640: Array[Int]

        do
                return [
                                -1, 1, 721 
                        ]
        end
        do
                return [
                                -1, 1, 721 
                        ]
        end

-       private meth action_table_row641: Array[Int]
+       private fun action_table_row641: Array[Int]

        do
                return [
                                -1, 3, 640 ,
                                76, 0, 758 
                        ]
        end
        do
                return [
                                -1, 3, 640 ,
                                76, 0, 758 
                        ]
        end

-       private meth action_table_row642: Array[Int]
+       private fun action_table_row642: Array[Int]

        do
                return [
                                -1, 3, 641 ,
        do
                return [
                                -1, 3, 641 ,

@@ -8341,7 +8341,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row643: Array[Int]
+       private fun action_table_row643: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8355,7 +8355,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row644: Array[Int]
+       private fun action_table_row644: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8363,7 +8363,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row645: Array[Int]
+       private fun action_table_row645: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8371,7 +8371,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row646: Array[Int]
+       private fun action_table_row646: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8379,13 +8379,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row647: Array[Int]
+       private fun action_table_row647: Array[Int]

        do
                return [
                                -1, 1, 55 
                        ]
        end
        do
                return [
                                -1, 1, 55 
                        ]
        end

-       private meth action_table_row648: Array[Int]
+       private fun action_table_row648: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8396,7 +8396,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row649: Array[Int]
+       private fun action_table_row649: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8407,7 +8407,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row650: Array[Int]
+       private fun action_table_row650: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8417,7 +8417,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row651: Array[Int]
+       private fun action_table_row651: Array[Int]

        do
                return [
                                -1, 3, 650 ,
        do
                return [
                                -1, 3, 650 ,

@@ -8428,13 +8428,13 @@ abstract class ParserTable
                                19, 0, 781 
                        ]
        end
                                19, 0, 781 
                        ]
        end

-       private meth action_table_row652: Array[Int]
+       private fun action_table_row652: Array[Int]

        do
                return [
                                -1, 1, 713 
                        ]
        end
        do
                return [
                                -1, 1, 713 
                        ]
        end

-       private meth action_table_row653: Array[Int]
+       private fun action_table_row653: Array[Int]

        do
                return [
                                -1, 3, 652 ,
        do
                return [
                                -1, 3, 652 ,

@@ -8442,7 +8442,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row654: Array[Int]
+       private fun action_table_row654: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8456,7 +8456,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row655: Array[Int]
+       private fun action_table_row655: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8464,7 +8464,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row656: Array[Int]
+       private fun action_table_row656: Array[Int]

        do
                return [
                                -1, 3, 655 ,
        do
                return [
                                -1, 3, 655 ,

@@ -8492,7 +8492,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row657: Array[Int]
+       private fun action_table_row657: Array[Int]

        do
                return [
                                -1, 3, 656 ,
        do
                return [
                                -1, 3, 656 ,

@@ -8520,31 +8520,31 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row658: Array[Int]
+       private fun action_table_row658: Array[Int]

        do
                return [
                                -1, 1, 330 
                        ]
        end
        do
                return [
                                -1, 1, 330 
                        ]
        end

-       private meth action_table_row659: Array[Int]
+       private fun action_table_row659: Array[Int]

        do
                return [
                                -1, 1, 350 
                        ]
        end
        do
                return [
                                -1, 1, 350 
                        ]
        end

-       private meth action_table_row660: Array[Int]
+       private fun action_table_row660: Array[Int]

        do
                return [
                                -1, 1, 355 
                        ]
        end
        do
                return [
                                -1, 1, 355 
                        ]
        end

-       private meth action_table_row661: Array[Int]
+       private fun action_table_row661: Array[Int]

        do
                return [
                                -1, 1, 443 
                        ]
        end
        do
                return [
                                -1, 1, 443 
                        ]
        end

-       private meth action_table_row662: Array[Int]
+       private fun action_table_row662: Array[Int]

        do
                return [
                                -1, 3, 661 ,
        do
                return [
                                -1, 3, 661 ,

@@ -8552,7 +8552,7 @@ abstract class ParserTable
                                55, 0, 527 
                        ]
        end
                                55, 0, 527 
                        ]
        end

-       private meth action_table_row663: Array[Int]
+       private fun action_table_row663: Array[Int]

        do
                return [
                                -1, 3, 662 ,
        do
                return [
                                -1, 3, 662 ,

@@ -8580,14 +8580,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row664: Array[Int]
+       private fun action_table_row664: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row665: Array[Int]
+       private fun action_table_row665: Array[Int]

        do
                return [
                                -1, 1, 448 ,
        do
                return [
                                -1, 1, 448 ,

@@ -8598,7 +8598,7 @@ abstract class ParserTable
                                63, 1, 444 
                        ]
        end
                                63, 1, 444 
                        ]
        end

-       private meth action_table_row666: Array[Int]
+       private fun action_table_row666: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8606,21 +8606,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row667: Array[Int]
+       private fun action_table_row667: Array[Int]

        do
                return [
                                -1, 1, 478 ,
                                82, 0, 791 
                        ]
        end
        do
                return [
                                -1, 1, 478 ,
                                82, 0, 791 
                        ]
        end

-       private meth action_table_row668: Array[Int]
+       private fun action_table_row668: Array[Int]

        do
                return [
                                -1, 1, 474 ,
                                9, 0, 792 
                        ]
        end
        do
                return [
                                -1, 1, 474 ,
                                9, 0, 792 
                        ]
        end

-       private meth action_table_row669: Array[Int]
+       private fun action_table_row669: Array[Int]

        do
                return [
                                -1, 3, 668 ,
        do
                return [
                                -1, 3, 668 ,

@@ -8628,7 +8628,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row670: Array[Int]
+       private fun action_table_row670: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8642,7 +8642,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row671: Array[Int]
+       private fun action_table_row671: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8650,7 +8650,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row672: Array[Int]
+       private fun action_table_row672: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8658,13 +8658,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row673: Array[Int]
+       private fun action_table_row673: Array[Int]

        do
                return [
                                -1, 1, 56 
                        ]
        end
        do
                return [
                                -1, 1, 56 
                        ]
        end

-       private meth action_table_row674: Array[Int]
+       private fun action_table_row674: Array[Int]

        do
                return [
                                -1, 3, 673 ,
        do
                return [
                                -1, 3, 673 ,

@@ -8672,7 +8672,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row675: Array[Int]
+       private fun action_table_row675: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -8686,21 +8686,21 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row676: Array[Int]
+       private fun action_table_row676: Array[Int]

        do
                return [
                                -1, 1, 335 ,
                                27, 1, 564 
                        ]
        end
        do
                return [
                                -1, 1, 335 ,
                                27, 1, 564 
                        ]
        end

-       private meth action_table_row677: Array[Int]
+       private fun action_table_row677: Array[Int]

        do
                return [
                                -1, 1, 312 ,
                                27, 1, 542 
                        ]
        end
        do
                return [
                                -1, 1, 312 ,
                                27, 1, 542 
                        ]
        end

-       private meth action_table_row678: Array[Int]
+       private fun action_table_row678: Array[Int]

        do
                return [
                                -1, 3, 677 ,
        do
                return [
                                -1, 3, 677 ,

@@ -8734,19 +8734,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row679: Array[Int]
+       private fun action_table_row679: Array[Int]

        do
                return [
                                -1, 1, 583 
                        ]
        end
        do
                return [
                                -1, 1, 583 
                        ]
        end

-       private meth action_table_row680: Array[Int]
+       private fun action_table_row680: Array[Int]

        do
                return [
                                -1, 1, 538 
                        ]
        end
        do
                return [
                                -1, 1, 538 
                        ]
        end

-       private meth action_table_row681: Array[Int]
+       private fun action_table_row681: Array[Int]

        do
                return [
                                -1, 1, 346 ,
        do
                return [
                                -1, 1, 346 ,

@@ -8755,7 +8755,7 @@ abstract class ParserTable
                                58, 0, 803 
                        ]
        end
                                58, 0, 803 
                        ]
        end

-       private meth action_table_row682: Array[Int]
+       private fun action_table_row682: Array[Int]

        do
                return [
                                -1, 3, 681 ,
        do
                return [
                                -1, 3, 681 ,

@@ -8783,13 +8783,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row683: Array[Int]
+       private fun action_table_row683: Array[Int]

        do
                return [
                                -1, 1, 369 
                        ]
        end
        do
                return [
                                -1, 1, 369 
                        ]
        end

-       private meth action_table_row684: Array[Int]
+       private fun action_table_row684: Array[Int]

        do
                return [
                                -1, 3, 683 ,
        do
                return [
                                -1, 3, 683 ,

@@ -8817,14 +8817,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row685: Array[Int]
+       private fun action_table_row685: Array[Int]

        do
                return [
                                -1, 3, 684 ,
                                77, 0, 807 
                        ]
        end
        do
                return [
                                -1, 3, 684 ,
                                77, 0, 807 
                        ]
        end

-       private meth action_table_row686: Array[Int]
+       private fun action_table_row686: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -8832,14 +8832,14 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row687: Array[Int]
+       private fun action_table_row687: Array[Int]

        do
                return [
                                -1, 1, 376 ,
                                27, 1, 589 
                        ]
        end
        do
                return [
                                -1, 1, 376 ,
                                27, 1, 589 
                        ]
        end

-       private meth action_table_row688: Array[Int]
+       private fun action_table_row688: Array[Int]

        do
                return [
                                -1, 1, 407 ,
        do
                return [
                                -1, 1, 407 ,

@@ -8847,25 +8847,25 @@ abstract class ParserTable
                                63, 0, 809 
                        ]
        end
                                63, 0, 809 
                        ]
        end

-       private meth action_table_row689: Array[Int]
+       private fun action_table_row689: Array[Int]

        do
                return [
                                -1, 1, 546 
                        ]
        end
        do
                return [
                                -1, 1, 546 
                        ]
        end

-       private meth action_table_row690: Array[Int]
+       private fun action_table_row690: Array[Int]

        do
                return [
                                -1, 1, 551 
                        ]
        end
        do
                return [
                                -1, 1, 551 
                        ]
        end

-       private meth action_table_row691: Array[Int]
+       private fun action_table_row691: Array[Int]

        do
                return [
                                -1, 1, 548 
                        ]
        end
        do
                return [
                                -1, 1, 548 
                        ]
        end

-       private meth action_table_row692: Array[Int]
+       private fun action_table_row692: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -8874,7 +8874,7 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row693: Array[Int]
+       private fun action_table_row693: Array[Int]

        do
                return [
                                -1, 3, 692 ,
        do
                return [
                                -1, 3, 692 ,

@@ -8902,20 +8902,20 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row694: Array[Int]
+       private fun action_table_row694: Array[Int]

        do
                return [
                                -1, 1, 587 
                        ]
        end
        do
                return [
                                -1, 1, 587 
                        ]
        end

-       private meth action_table_row695: Array[Int]
+       private fun action_table_row695: Array[Int]

        do
                return [
                                -1, 1, 332 ,
                                27, 1, 561 
                        ]
        end
        do
                return [
                                -1, 1, 332 ,
                                27, 1, 561 
                        ]
        end

-       private meth action_table_row696: Array[Int]
+       private fun action_table_row696: Array[Int]

        do
                return [
                                -1, 1, 414 ,
        do
                return [
                                -1, 1, 414 ,

@@ -8924,7 +8924,7 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row697: Array[Int]
+       private fun action_table_row697: Array[Int]

        do
                return [
                                -1, 1, 329 ,
        do
                return [
                                -1, 1, 329 ,

@@ -8932,7 +8932,7 @@ abstract class ParserTable
                                48, 0, 814 
                        ]
        end
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row698: Array[Int]
+       private fun action_table_row698: Array[Int]

        do
                return [
                                -1, 3, 697 ,
        do
                return [
                                -1, 3, 697 ,

@@ -8960,7 +8960,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row699: Array[Int]
+       private fun action_table_row699: Array[Int]

        do
                return [
                                -1, 3, 698 ,
        do
                return [
                                -1, 3, 698 ,

@@ -8988,7 +8988,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row700: Array[Int]
+       private fun action_table_row700: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -8996,7 +8996,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row701: Array[Int]
+       private fun action_table_row701: Array[Int]

        do
                return [
                                -1, 1, 419 ,
        do
                return [
                                -1, 1, 419 ,

@@ -9005,7 +9005,7 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row702: Array[Int]
+       private fun action_table_row702: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -9034,7 +9034,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row703: Array[Int]
+       private fun action_table_row703: Array[Int]

        do
                return [
                                -1, 3, 702 ,
        do
                return [
                                -1, 3, 702 ,

@@ -9042,13 +9042,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row704: Array[Int]
+       private fun action_table_row704: Array[Int]

        do
                return [
                                -1, 1, 368 
                        ]
        end
        do
                return [
                                -1, 1, 368 
                        ]
        end

-       private meth action_table_row705: Array[Int]
+       private fun action_table_row705: Array[Int]

        do
                return [
                                -1, 3, 704 ,
        do
                return [
                                -1, 3, 704 ,

@@ -9084,7 +9084,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row706: Array[Int]
+       private fun action_table_row706: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9092,7 +9092,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row707: Array[Int]
+       private fun action_table_row707: Array[Int]

        do
                return [
                                -1, 3, 706 ,
        do
                return [
                                -1, 3, 706 ,

@@ -9120,13 +9120,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row708: Array[Int]
+       private fun action_table_row708: Array[Int]

        do
                return [
                                -1, 1, 377 
                        ]
        end
        do
                return [
                                -1, 1, 377 
                        ]
        end

-       private meth action_table_row709: Array[Int]
+       private fun action_table_row709: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9134,7 +9134,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row710: Array[Int]
+       private fun action_table_row710: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9142,33 +9142,33 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row711: Array[Int]
+       private fun action_table_row711: Array[Int]

        do
                return [
                                -1, 1, 722 
                        ]
        end
        do
                return [
                                -1, 1, 722 
                        ]
        end

-       private meth action_table_row712: Array[Int]
+       private fun action_table_row712: Array[Int]

        do
                return [
                                -1, 1, 305 ,
                                55, 0, 709 
                        ]
        end
        do
                return [
                                -1, 1, 305 ,
                                55, 0, 709 
                        ]
        end

-       private meth action_table_row713: Array[Int]
+       private fun action_table_row713: Array[Int]

        do
                return [
                                -1, 3, 712 ,
                                54, 0, 832 
                        ]
        end
        do
                return [
                                -1, 3, 712 ,
                                54, 0, 832 
                        ]
        end

-       private meth action_table_row714: Array[Int]
+       private fun action_table_row714: Array[Int]

        do
                return [
                                -1, 1, 420 
                        ]
        end
        do
                return [
                                -1, 1, 420 
                        ]
        end

-       private meth action_table_row715: Array[Int]
+       private fun action_table_row715: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9176,14 +9176,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row716: Array[Int]
+       private fun action_table_row716: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row717: Array[Int]
+       private fun action_table_row717: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9191,7 +9191,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row718: Array[Int]
+       private fun action_table_row718: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9199,7 +9199,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row719: Array[Int]
+       private fun action_table_row719: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9207,7 +9207,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row720: Array[Int]
+       private fun action_table_row720: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9215,38 +9215,38 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row721: Array[Int]
+       private fun action_table_row721: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row722: Array[Int]
+       private fun action_table_row722: Array[Int]

        do
                return [
                                -1, 1, 526 
                        ]
        end
        do
                return [
                                -1, 1, 526 
                        ]
        end

-       private meth action_table_row723: Array[Int]
+       private fun action_table_row723: Array[Int]

        do
                return [
                                -1, 1, 527 
                        ]
        end
        do
                return [
                                -1, 1, 527 
                        ]
        end

-       private meth action_table_row724: Array[Int]
+       private fun action_table_row724: Array[Int]

        do
                return [
                                -1, 1, 528 
                        ]
        end
        do
                return [
                                -1, 1, 528 
                        ]
        end

-       private meth action_table_row725: Array[Int]
+       private fun action_table_row725: Array[Int]

        do
                return [
                                -1, 1, 529 
                        ]
        end
        do
                return [
                                -1, 1, 529 
                        ]
        end

-       private meth action_table_row726: Array[Int]
+       private fun action_table_row726: Array[Int]

        do
                return [
                                -1, 3, 725 ,
        do
                return [
                                -1, 3, 725 ,

@@ -9268,7 +9268,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row727: Array[Int]
+       private fun action_table_row727: Array[Int]

        do
                return [
                                -1, 3, 726 ,
        do
                return [
                                -1, 3, 726 ,

@@ -9296,7 +9296,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row728: Array[Int]
+       private fun action_table_row728: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9304,7 +9304,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row729: Array[Int]
+       private fun action_table_row729: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -9312,50 +9312,50 @@ abstract class ParserTable
                                57, 0, 173 
                        ]
        end
                                57, 0, 173 
                        ]
        end

-       private meth action_table_row730: Array[Int]
+       private fun action_table_row730: Array[Int]

        do
                return [
                                -1, 1, 518 
                        ]
        end
        do
                return [
                                -1, 1, 518 
                        ]
        end

-       private meth action_table_row731: Array[Int]
+       private fun action_table_row731: Array[Int]

        do
                return [
                                -1, 1, 530 
                        ]
        end
        do
                return [
                                -1, 1, 530 
                        ]
        end

-       private meth action_table_row732: Array[Int]
+       private fun action_table_row732: Array[Int]

        do
                return [
                                -1, 1, 531 
                        ]
        end
        do
                return [
                                -1, 1, 531 
                        ]
        end

-       private meth action_table_row733: Array[Int]
+       private fun action_table_row733: Array[Int]

        do
                return [
                                -1, 1, 532 
                        ]
        end
        do
                return [
                                -1, 1, 532 
                        ]
        end

-       private meth action_table_row734: Array[Int]
+       private fun action_table_row734: Array[Int]

        do
                return [
                                -1, 1, 533 
                        ]
        end
        do
                return [
                                -1, 1, 533 
                        ]
        end

-       private meth action_table_row735: Array[Int]
+       private fun action_table_row735: Array[Int]

        do
                return [
                                -1, 1, 534 
                        ]
        end
        do
                return [
                                -1, 1, 534 
                        ]
        end

-       private meth action_table_row736: Array[Int]
+       private fun action_table_row736: Array[Int]

        do
                return [
                                -1, 3, 735 ,
                                42, 0, 846 
                        ]
        end
        do
                return [
                                -1, 3, 735 ,
                                42, 0, 846 
                        ]
        end

-       private meth action_table_row737: Array[Int]
+       private fun action_table_row737: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9363,7 +9363,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row738: Array[Int]
+       private fun action_table_row738: Array[Int]

        do
                return [
                                -1, 1, 486 ,
        do
                return [
                                -1, 1, 486 ,

@@ -9371,19 +9371,19 @@ abstract class ParserTable
                                32, 0, 849 
                        ]
        end
                                32, 0, 849 
                        ]
        end

-       private meth action_table_row739: Array[Int]
+       private fun action_table_row739: Array[Int]

        do
                return [
                                -1, 1, 488 
                        ]
        end
        do
                return [
                                -1, 1, 488 
                        ]
        end

-       private meth action_table_row740: Array[Int]
+       private fun action_table_row740: Array[Int]

        do
                return [
                                -1, 1, 491 
                        ]
        end
        do
                return [
                                -1, 1, 491 
                        ]
        end

-       private meth action_table_row741: Array[Int]
+       private fun action_table_row741: Array[Int]

        do
                return [
                                -1, 1, 493 ,
        do
                return [
                                -1, 1, 493 ,

@@ -9400,7 +9400,7 @@ abstract class ParserTable
                                75, 0, 860 
                        ]
        end
                                75, 0, 860 
                        ]
        end

-       private meth action_table_row742: Array[Int]
+       private fun action_table_row742: Array[Int]

        do
                return [
                                -1, 1, 503 ,
        do
                return [
                                -1, 1, 503 ,

@@ -9409,26 +9409,26 @@ abstract class ParserTable
                                68, 0, 863 
                        ]
        end
                                68, 0, 863 
                        ]
        end

-       private meth action_table_row743: Array[Int]
+       private fun action_table_row743: Array[Int]

        do
                return [
                                -1, 1, 506 
                        ]
        end
        do
                return [
                                -1, 1, 506 
                        ]
        end

-       private meth action_table_row744: Array[Int]
+       private fun action_table_row744: Array[Int]

        do
                return [
                                -1, 1, 510 
                        ]
        end
        do
                return [
                                -1, 1, 510 
                        ]
        end

-       private meth action_table_row745: Array[Int]
+       private fun action_table_row745: Array[Int]

        do
                return [
                                -1, 1, 513 ,
                                63, 0, 864 
                        ]
        end
        do
                return [
                                -1, 1, 513 ,
                                63, 0, 864 
                        ]
        end

-       private meth action_table_row746: Array[Int]
+       private fun action_table_row746: Array[Int]

        do
                return [
                                -1, 1, 340 ,
        do
                return [
                                -1, 1, 340 ,

@@ -9462,7 +9462,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row747: Array[Int]
+       private fun action_table_row747: Array[Int]

        do
                return [
                                -1, 3, 746 ,
        do
                return [
                                -1, 3, 746 ,

@@ -9470,7 +9470,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row748: Array[Int]
+       private fun action_table_row748: Array[Int]

        do
                return [
                                -1, 3, 747 ,
        do
                return [
                                -1, 3, 747 ,

@@ -9478,21 +9478,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row749: Array[Int]
+       private fun action_table_row749: Array[Int]

        do
                return [
                                -1, 3, 748 ,
                                77, 0, 868 
                        ]
        end
        do
                return [
                                -1, 3, 748 ,
                                77, 0, 868 
                        ]
        end

-       private meth action_table_row750: Array[Int]
+       private fun action_table_row750: Array[Int]

        do
                return [
                                -1, 1, 293 ,
                                61, 0, 869 
                        ]
        end
        do
                return [
                                -1, 1, 293 ,
                                61, 0, 869 
                        ]
        end

-       private meth action_table_row751: Array[Int]
+       private fun action_table_row751: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9500,20 +9500,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row752: Array[Int]
+       private fun action_table_row752: Array[Int]

        do
                return [
                                -1, 1, 718 
                        ]
        end
        do
                return [
                                -1, 1, 718 
                        ]
        end

-       private meth action_table_row753: Array[Int]
+       private fun action_table_row753: Array[Int]

        do
                return [
                                -1, 3, 752 ,
                                52, 0, 871 
                        ]
        end
        do
                return [
                                -1, 3, 752 ,
                                52, 0, 871 
                        ]
        end

-       private meth action_table_row754: Array[Int]
+       private fun action_table_row754: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9522,26 +9522,26 @@ abstract class ParserTable
                                55, 0, 750 
                        ]
        end
                                55, 0, 750 
                        ]
        end

-       private meth action_table_row755: Array[Int]
+       private fun action_table_row755: Array[Int]

        do
                return [
                                -1, 1, 479 
                        ]
        end
        do
                return [
                                -1, 1, 479 
                        ]
        end

-       private meth action_table_row756: Array[Int]
+       private fun action_table_row756: Array[Int]

        do
                return [
                                -1, 1, 475 
                        ]
        end
        do
                return [
                                -1, 1, 475 
                        ]
        end

-       private meth action_table_row757: Array[Int]
+       private fun action_table_row757: Array[Int]

        do
                return [
                                -1, 3, 756 ,
                                77, 0, 874 
                        ]
        end
        do
                return [
                                -1, 3, 756 ,
                                77, 0, 874 
                        ]
        end

-       private meth action_table_row758: Array[Int]
+       private fun action_table_row758: Array[Int]

        do
                return [
                                -1, 1, 284 ,
        do
                return [
                                -1, 1, 284 ,

@@ -9549,14 +9549,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row759: Array[Int]
+       private fun action_table_row759: Array[Int]

        do
                return [
                                -1, 1, 86 ,
                                56, 0, 258 
                        ]
        end
        do
                return [
                                -1, 1, 86 ,
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row760: Array[Int]
+       private fun action_table_row760: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9565,7 +9565,7 @@ abstract class ParserTable
                                55, 0, 879 
                        ]
        end
                                55, 0, 879 
                        ]
        end

-       private meth action_table_row761: Array[Int]
+       private fun action_table_row761: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9573,13 +9573,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row762: Array[Int]
+       private fun action_table_row762: Array[Int]

        do
                return [
                                -1, 1, 57 
                        ]
        end
        do
                return [
                                -1, 1, 57 
                        ]
        end

-       private meth action_table_row763: Array[Int]
+       private fun action_table_row763: Array[Int]

        do
                return [
                                -1, 3, 762 ,
        do
                return [
                                -1, 3, 762 ,

@@ -9587,7 +9587,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row764: Array[Int]
+       private fun action_table_row764: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9601,13 +9601,13 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row765: Array[Int]
+       private fun action_table_row765: Array[Int]

        do
                return [
                                -1, 1, 716 
                        ]
        end
        do
                return [
                                -1, 1, 716 
                        ]
        end

-       private meth action_table_row766: Array[Int]
+       private fun action_table_row766: Array[Int]

        do
                return [
                                -1, 3, 765 ,
        do
                return [
                                -1, 3, 765 ,

@@ -9615,7 +9615,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row767: Array[Int]
+       private fun action_table_row767: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9628,7 +9628,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row768: Array[Int]
+       private fun action_table_row768: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9636,7 +9636,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row769: Array[Int]
+       private fun action_table_row769: Array[Int]

        do
                return [
                                -1, 3, 768 ,
        do
                return [
                                -1, 3, 768 ,

@@ -9644,7 +9644,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row770: Array[Int]
+       private fun action_table_row770: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9655,7 +9655,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row771: Array[Int]
+       private fun action_table_row771: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9665,7 +9665,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row772: Array[Int]
+       private fun action_table_row772: Array[Int]

        do
                return [
                                -1, 3, 771 ,
        do
                return [
                                -1, 3, 771 ,

@@ -9676,7 +9676,7 @@ abstract class ParserTable
                                19, 0, 901 
                        ]
        end
                                19, 0, 901 
                        ]
        end

-       private meth action_table_row773: Array[Int]
+       private fun action_table_row773: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9686,7 +9686,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row774: Array[Int]
+       private fun action_table_row774: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9696,7 +9696,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row775: Array[Int]
+       private fun action_table_row775: Array[Int]

        do
                return [
                                -1, 3, 774 ,
        do
                return [
                                -1, 3, 774 ,

@@ -9704,7 +9704,7 @@ abstract class ParserTable
                                19, 0, 907 
                        ]
        end
                                19, 0, 907 
                        ]
        end

-       private meth action_table_row776: Array[Int]
+       private fun action_table_row776: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9713,7 +9713,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row777: Array[Int]
+       private fun action_table_row777: Array[Int]

        do
                return [
                                -1, 3, 776 ,
        do
                return [
                                -1, 3, 776 ,

@@ -9721,7 +9721,7 @@ abstract class ParserTable
                                19, 0, 910 
                        ]
        end
                                19, 0, 910 
                        ]
        end

-       private meth action_table_row778: Array[Int]
+       private fun action_table_row778: Array[Int]

        do
                return [
                                -1, 3, 777 ,
        do
                return [
                                -1, 3, 777 ,

@@ -9741,21 +9741,21 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row779: Array[Int]
+       private fun action_table_row779: Array[Int]

        do
                return [
                                -1, 3, 778 ,
                                76, 0, 912 
                        ]
        end
        do
                return [
                                -1, 3, 778 ,
                                76, 0, 912 
                        ]
        end

-       private meth action_table_row780: Array[Int]
+       private fun action_table_row780: Array[Int]

        do
                return [
                                -1, 3, 779 ,
                                78, 0, 913 
                        ]
        end
        do
                return [
                                -1, 3, 779 ,
                                78, 0, 913 
                        ]
        end

-       private meth action_table_row781: Array[Int]
+       private fun action_table_row781: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9779,14 +9779,14 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row782: Array[Int]
+       private fun action_table_row782: Array[Int]

        do
                return [
                                -1, 3, 781 ,
                                78, 0, 916 
                        ]
        end
        do
                return [
                                -1, 3, 781 ,
                                78, 0, 916 
                        ]
        end

-       private meth action_table_row783: Array[Int]
+       private fun action_table_row783: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9794,13 +9794,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row784: Array[Int]
+       private fun action_table_row784: Array[Int]

        do
                return [
                                -1, 1, 59 
                        ]
        end
        do
                return [
                                -1, 1, 59 
                        ]
        end

-       private meth action_table_row785: Array[Int]
+       private fun action_table_row785: Array[Int]

        do
                return [
                                -1, 3, 784 ,
        do
                return [
                                -1, 3, 784 ,

@@ -9809,25 +9809,25 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row786: Array[Int]
+       private fun action_table_row786: Array[Int]

        do
                return [
                                -1, 1, 352 
                        ]
        end
        do
                return [
                                -1, 1, 352 
                        ]
        end

-       private meth action_table_row787: Array[Int]
+       private fun action_table_row787: Array[Int]

        do
                return [
                                -1, 1, 357 
                        ]
        end
        do
                return [
                                -1, 1, 357 
                        ]
        end

-       private meth action_table_row788: Array[Int]
+       private fun action_table_row788: Array[Int]

        do
                return [
                                -1, 1, 444 
                        ]
        end
        do
                return [
                                -1, 1, 444 
                        ]
        end

-       private meth action_table_row789: Array[Int]
+       private fun action_table_row789: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9835,13 +9835,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row790: Array[Int]
+       private fun action_table_row790: Array[Int]

        do
                return [
                                -1, 1, 638 
                        ]
        end
        do
                return [
                                -1, 1, 638 
                        ]
        end

-       private meth action_table_row791: Array[Int]
+       private fun action_table_row791: Array[Int]

        do
                return [
                                -1, 3, 790 ,
        do
                return [
                                -1, 3, 790 ,

@@ -9850,19 +9850,19 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row792: Array[Int]
+       private fun action_table_row792: Array[Int]

        do
                return [
                                -1, 1, 480 
                        ]
        end
        do
                return [
                                -1, 1, 480 
                        ]
        end

-       private meth action_table_row793: Array[Int]
+       private fun action_table_row793: Array[Int]

        do
                return [
                                -1, 1, 476 
                        ]
        end
        do
                return [
                                -1, 1, 476 
                        ]
        end

-       private meth action_table_row794: Array[Int]
+       private fun action_table_row794: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9870,13 +9870,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row795: Array[Int]
+       private fun action_table_row795: Array[Int]

        do
                return [
                                -1, 1, 58 
                        ]
        end
        do
                return [
                                -1, 1, 58 
                        ]
        end

-       private meth action_table_row796: Array[Int]
+       private fun action_table_row796: Array[Int]

        do
                return [
                                -1, 3, 795 ,
        do
                return [
                                -1, 3, 795 ,

@@ -9884,7 +9884,7 @@ abstract class ParserTable
                                1, 0, 74 
                        ]
        end
                                1, 0, 74 
                        ]
        end

-       private meth action_table_row797: Array[Int]
+       private fun action_table_row797: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9898,7 +9898,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row798: Array[Int]
+       private fun action_table_row798: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -9911,7 +9911,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row799: Array[Int]
+       private fun action_table_row799: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9919,7 +9919,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row800: Array[Int]
+       private fun action_table_row800: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9927,20 +9927,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row801: Array[Int]
+       private fun action_table_row801: Array[Int]

        do
                return [
                                -1, 1, 60 
                        ]
        end
        do
                return [
                                -1, 1, 60 
                        ]
        end

-       private meth action_table_row802: Array[Int]
+       private fun action_table_row802: Array[Int]

        do
                return [
                                -1, 1, 311 ,
                                27, 1, 541 
                        ]
        end
        do
                return [
                                -1, 1, 311 ,
                                27, 1, 541 
                        ]
        end

-       private meth action_table_row803: Array[Int]
+       private fun action_table_row803: Array[Int]

        do
                return [
                                -1, 3, 802 ,
        do
                return [
                                -1, 3, 802 ,

@@ -9948,7 +9948,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row804: Array[Int]
+       private fun action_table_row804: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9956,7 +9956,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row805: Array[Int]
+       private fun action_table_row805: Array[Int]

        do
                return [
                                -1, 1, 347 ,
        do
                return [
                                -1, 1, 347 ,

@@ -9964,7 +9964,7 @@ abstract class ParserTable
                                58, 0, 935 
                        ]
        end
                                58, 0, 935 
                        ]
        end

-       private meth action_table_row806: Array[Int]
+       private fun action_table_row806: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9972,7 +9972,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row807: Array[Int]
+       private fun action_table_row807: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9980,7 +9980,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row808: Array[Int]
+       private fun action_table_row808: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -9988,14 +9988,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row809: Array[Int]
+       private fun action_table_row809: Array[Int]

        do
                return [
                                -1, 1, 414 ,
                                48, 0, 814 
                        ]
        end
        do
                return [
                                -1, 1, 414 ,
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row810: Array[Int]
+       private fun action_table_row810: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10003,20 +10003,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row811: Array[Int]
+       private fun action_table_row811: Array[Int]

        do
                return [
                                -1, 1, 419 ,
                                48, 0, 814 
                        ]
        end
        do
                return [
                                -1, 1, 419 ,
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row812: Array[Int]
+       private fun action_table_row812: Array[Int]

        do
                return [
                                -1, 1, 588 
                        ]
        end
        do
                return [
                                -1, 1, 588 
                        ]
        end

-       private meth action_table_row813: Array[Int]
+       private fun action_table_row813: Array[Int]

        do
                return [
                                -1, 3, 812 ,
        do
                return [
                                -1, 3, 812 ,

@@ -10044,7 +10044,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row814: Array[Int]
+       private fun action_table_row814: Array[Int]

        do
                return [
                                -1, 3, 813 ,
        do
                return [
                                -1, 3, 813 ,

@@ -10072,7 +10072,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row815: Array[Int]
+       private fun action_table_row815: Array[Int]

        do
                return [
                                -1, 3, 814 ,
        do
                return [
                                -1, 3, 814 ,

@@ -10080,38 +10080,38 @@ abstract class ParserTable
                                77, 0, 430 
                        ]
        end
                                77, 0, 430 
                        ]
        end

-       private meth action_table_row816: Array[Int]
+       private fun action_table_row816: Array[Int]

        do
                return [
                                -1, 3, 815 ,
                                48, 0, 814 
                        ]
        end
        do
                return [
                                -1, 3, 815 ,
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row817: Array[Int]
+       private fun action_table_row817: Array[Int]

        do
                return [
                                -1, 1, 560 
                        ]
        end
        do
                return [
                                -1, 1, 560 
                        ]
        end

-       private meth action_table_row818: Array[Int]
+       private fun action_table_row818: Array[Int]

        do
                return [
                                -1, 1, 565 
                        ]
        end
        do
                return [
                                -1, 1, 565 
                        ]
        end

-       private meth action_table_row819: Array[Int]
+       private fun action_table_row819: Array[Int]

        do
                return [
                                -1, 1, 574 
                        ]
        end
        do
                return [
                                -1, 1, 574 
                        ]
        end

-       private meth action_table_row820: Array[Int]
+       private fun action_table_row820: Array[Int]

        do
                return [
                                -1, 1, 579 
                        ]
        end
        do
                return [
                                -1, 1, 579 
                        ]
        end

-       private meth action_table_row821: Array[Int]
+       private fun action_table_row821: Array[Int]

        do
                return [
                                -1, 3, 820 ,
        do
                return [
                                -1, 3, 820 ,

@@ -10121,7 +10121,7 @@ abstract class ParserTable
                                78, 0, 949 
                        ]
        end
                                78, 0, 949 
                        ]
        end

-       private meth action_table_row822: Array[Int]
+       private fun action_table_row822: Array[Int]

        do
                return [
                                -1, 3, 821 ,
        do
                return [
                                -1, 3, 821 ,

@@ -10149,7 +10149,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row823: Array[Int]
+       private fun action_table_row823: Array[Int]

        do
                return [
                                -1, 3, 822 ,
        do
                return [
                                -1, 3, 822 ,

@@ -10177,14 +10177,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row824: Array[Int]
+       private fun action_table_row824: Array[Int]

        do
                return [
                                -1, 1, 333 ,
                                27, 1, 562 
                        ]
        end
        do
                return [
                                -1, 1, 333 ,
                                27, 1, 562 
                        ]
        end

-       private meth action_table_row825: Array[Int]
+       private fun action_table_row825: Array[Int]

        do
                return [
                                -1, 3, 824 ,
        do
                return [
                                -1, 3, 824 ,

@@ -10219,7 +10219,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row826: Array[Int]
+       private fun action_table_row826: Array[Int]

        do
                return [
                                -1, 3, 825 ,
        do
                return [
                                -1, 3, 825 ,

@@ -10227,20 +10227,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row827: Array[Int]
+       private fun action_table_row827: Array[Int]

        do
                return [
                                -1, 1, 363 
                        ]
        end
        do
                return [
                                -1, 1, 363 
                        ]
        end

-       private meth action_table_row828: Array[Int]
+       private fun action_table_row828: Array[Int]

        do
                return [
                                -1, 3, 827 ,
                                16, 0, 954 
                        ]
        end
        do
                return [
                                -1, 3, 827 ,
                                16, 0, 954 
                        ]
        end

-       private meth action_table_row829: Array[Int]
+       private fun action_table_row829: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10248,14 +10248,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row830: Array[Int]
+       private fun action_table_row830: Array[Int]

        do
                return [
                                -1, 3, 829 ,
                                54, 0, 956 
                        ]
        end
        do
                return [
                                -1, 3, 829 ,
                                54, 0, 956 
                        ]
        end

-       private meth action_table_row831: Array[Int]
+       private fun action_table_row831: Array[Int]

        do
                return [
                                -1, 3, 830 ,
        do
                return [
                                -1, 3, 830 ,

@@ -10263,31 +10263,31 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row832: Array[Int]
+       private fun action_table_row832: Array[Int]

        do
                return [
                                -1, 1, 723 
                        ]
        end
        do
                return [
                                -1, 1, 723 
                        ]
        end

-       private meth action_table_row833: Array[Int]
+       private fun action_table_row833: Array[Int]

        do
                return [
                                -1, 1, 302 
                        ]
        end
        do
                return [
                                -1, 1, 302 
                        ]
        end

-       private meth action_table_row834: Array[Int]
+       private fun action_table_row834: Array[Int]

        do
                return [
                                -1, 1, 454 
                        ]
        end
        do
                return [
                                -1, 1, 454 
                        ]
        end

-       private meth action_table_row835: Array[Int]
+       private fun action_table_row835: Array[Int]

        do
                return [
                                -1, 1, 524 
                        ]
        end
        do
                return [
                                -1, 1, 524 
                        ]
        end

-       private meth action_table_row836: Array[Int]
+       private fun action_table_row836: Array[Int]

        do
                return [
                                -1, 3, 835 ,
        do
                return [
                                -1, 3, 835 ,

@@ -10315,7 +10315,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row837: Array[Int]
+       private fun action_table_row837: Array[Int]

        do
                return [
                                -1, 3, 836 ,
        do
                return [
                                -1, 3, 836 ,

@@ -10341,7 +10341,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row838: Array[Int]
+       private fun action_table_row838: Array[Int]

        do
                return [
                                -1, 3, 837 ,
        do
                return [
                                -1, 3, 837 ,

@@ -10349,7 +10349,7 @@ abstract class ParserTable
                                76, 0, 961 
                        ]
        end
                                76, 0, 961 
                        ]
        end

-       private meth action_table_row839: Array[Int]
+       private fun action_table_row839: Array[Int]

        do
                return [
                                -1, 3, 838 ,
        do
                return [
                                -1, 3, 838 ,

@@ -10374,13 +10374,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row840: Array[Int]
+       private fun action_table_row840: Array[Int]

        do
                return [
                                -1, 1, 521 
                        ]
        end
        do
                return [
                                -1, 1, 521 
                        ]
        end

-       private meth action_table_row841: Array[Int]
+       private fun action_table_row841: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10388,28 +10388,28 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row842: Array[Int]
+       private fun action_table_row842: Array[Int]

        do
                return [
                                -1, 1, 516 ,
                                63, 1, 518 
                        ]
        end
        do
                return [
                                -1, 1, 516 ,
                                63, 1, 518 
                        ]
        end

-       private meth action_table_row843: Array[Int]
+       private fun action_table_row843: Array[Int]

        do
                return [
                                -1, 3, 842 ,
                                63, 0, 965 
                        ]
        end
        do
                return [
                                -1, 3, 842 ,
                                63, 0, 965 
                        ]
        end

-       private meth action_table_row844: Array[Int]
+       private fun action_table_row844: Array[Int]

        do
                return [
                                -1, 3, 843 ,
                                52, 0, 966 
                        ]
        end
        do
                return [
                                -1, 3, 843 ,
                                52, 0, 966 
                        ]
        end

-       private meth action_table_row845: Array[Int]
+       private fun action_table_row845: Array[Int]

        do
                return [
                                -1, 3, 844 ,
        do
                return [
                                -1, 3, 844 ,

@@ -10434,20 +10434,20 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row846: Array[Int]
+       private fun action_table_row846: Array[Int]

        do
                return [
                                -1, 1, 520 
                        ]
        end
        do
                return [
                                -1, 1, 520 
                        ]
        end

-       private meth action_table_row847: Array[Int]
+       private fun action_table_row847: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row848: Array[Int]
+       private fun action_table_row848: Array[Int]

        do
                return [
                                -1, 3, 847 ,
        do
                return [
                                -1, 3, 847 ,

@@ -10455,7 +10455,7 @@ abstract class ParserTable
                                54, 0, 970 
                        ]
        end
                                54, 0, 970 
                        ]
        end

-       private meth action_table_row849: Array[Int]
+       private fun action_table_row849: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10463,7 +10463,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row850: Array[Int]
+       private fun action_table_row850: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10471,7 +10471,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row851: Array[Int]
+       private fun action_table_row851: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10479,7 +10479,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row852: Array[Int]
+       private fun action_table_row852: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10487,7 +10487,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row853: Array[Int]
+       private fun action_table_row853: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10495,7 +10495,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row854: Array[Int]
+       private fun action_table_row854: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10503,7 +10503,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row855: Array[Int]
+       private fun action_table_row855: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10511,7 +10511,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row856: Array[Int]
+       private fun action_table_row856: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10519,7 +10519,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row857: Array[Int]
+       private fun action_table_row857: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10527,7 +10527,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row858: Array[Int]
+       private fun action_table_row858: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10535,7 +10535,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row859: Array[Int]
+       private fun action_table_row859: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10543,7 +10543,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row860: Array[Int]
+       private fun action_table_row860: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10551,7 +10551,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row861: Array[Int]
+       private fun action_table_row861: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10559,7 +10559,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row862: Array[Int]
+       private fun action_table_row862: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10567,7 +10567,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row863: Array[Int]
+       private fun action_table_row863: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10575,7 +10575,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row864: Array[Int]
+       private fun action_table_row864: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10583,7 +10583,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row865: Array[Int]
+       private fun action_table_row865: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10591,7 +10591,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row866: Array[Int]
+       private fun action_table_row866: Array[Int]

        do
                return [
                                -1, 1, 341 ,
        do
                return [
                                -1, 1, 341 ,

@@ -10625,7 +10625,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row867: Array[Int]
+       private fun action_table_row867: Array[Int]

        do
                return [
                                -1, 1, 342 ,
        do
                return [
                                -1, 1, 342 ,

@@ -10659,7 +10659,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row868: Array[Int]
+       private fun action_table_row868: Array[Int]

        do
                return [
                                -1, 3, 867 ,
        do
                return [
                                -1, 3, 867 ,

@@ -10667,45 +10667,45 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row869: Array[Int]
+       private fun action_table_row869: Array[Int]

        do
                return [
                                -1, 1, 456 
                        ]
        end
        do
                return [
                                -1, 1, 456 
                        ]
        end

-       private meth action_table_row870: Array[Int]
+       private fun action_table_row870: Array[Int]

        do
                return [
                                -1, 1, 294 
                        ]
        end
        do
                return [
                                -1, 1, 294 
                        ]
        end

-       private meth action_table_row871: Array[Int]
+       private fun action_table_row871: Array[Int]

        do
                return [
                                -1, 3, 870 ,
                                77, 0, 631 
                        ]
        end
        do
                return [
                                -1, 3, 870 ,
                                77, 0, 631 
                        ]
        end

-       private meth action_table_row872: Array[Int]
+       private fun action_table_row872: Array[Int]

        do
                return [
                                -1, 1, 288 
                        ]
        end
        do
                return [
                                -1, 1, 288 
                        ]
        end

-       private meth action_table_row873: Array[Int]
+       private fun action_table_row873: Array[Int]

        do
                return [
                                -1, 1, 719 
                        ]
        end
        do
                return [
                                -1, 1, 719 
                        ]
        end

-       private meth action_table_row874: Array[Int]
+       private fun action_table_row874: Array[Int]

        do
                return [
                                -1, 3, 873 ,
                                52, 0, 990 
                        ]
        end
        do
                return [
                                -1, 3, 873 ,
                                52, 0, 990 
                        ]
        end

-       private meth action_table_row875: Array[Int]
+       private fun action_table_row875: Array[Int]

        do
                return [
                                -1, 1, 284 ,
        do
                return [
                                -1, 1, 284 ,

@@ -10713,7 +10713,7 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row876: Array[Int]
+       private fun action_table_row876: Array[Int]

        do
                return [
                                -1, 3, 875 ,
        do
                return [
                                -1, 3, 875 ,

@@ -10722,26 +10722,26 @@ abstract class ParserTable
                                16, 0, 992 
                        ]
        end
                                16, 0, 992 
                        ]
        end

-       private meth action_table_row877: Array[Int]
+       private fun action_table_row877: Array[Int]

        do
                return [
                                -1, 1, 285 ,
                                56, 0, 258 
                        ]
        end
        do
                return [
                                -1, 1, 285 ,
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row878: Array[Int]
+       private fun action_table_row878: Array[Int]

        do
                return [
                                -1, 1, 286 
                        ]
        end
        do
                return [
                                -1, 1, 286 
                        ]
        end

-       private meth action_table_row879: Array[Int]
+       private fun action_table_row879: Array[Int]

        do
                return [
                                -1, 1, 87 
                        ]
        end
        do
                return [
                                -1, 1, 87 
                        ]
        end

-       private meth action_table_row880: Array[Int]
+       private fun action_table_row880: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10749,20 +10749,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row881: Array[Int]
+       private fun action_table_row881: Array[Int]

        do
                return [
                                -1, 1, 714 
                        ]
        end
        do
                return [
                                -1, 1, 714 
                        ]
        end

-       private meth action_table_row882: Array[Int]
+       private fun action_table_row882: Array[Int]

        do
                return [
                                -1, 3, 881 ,
                                54, 0, 996 
                        ]
        end
        do
                return [
                                -1, 3, 881 ,
                                54, 0, 996 
                        ]
        end

-       private meth action_table_row883: Array[Int]
+       private fun action_table_row883: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10771,7 +10771,7 @@ abstract class ParserTable
                                55, 0, 879 
                        ]
        end
                                55, 0, 879 
                        ]
        end

-       private meth action_table_row884: Array[Int]
+       private fun action_table_row884: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10784,7 +10784,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row885: Array[Int]
+       private fun action_table_row885: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10792,7 +10792,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row886: Array[Int]
+       private fun action_table_row886: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10800,31 +10800,31 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row887: Array[Int]
+       private fun action_table_row887: Array[Int]

        do
                return [
                                -1, 1, 61 
                        ]
        end
        do
                return [
                                -1, 1, 61 
                        ]
        end

-       private meth action_table_row888: Array[Int]
+       private fun action_table_row888: Array[Int]

        do
                return [
                                -1, 1, 89 
                        ]
        end
        do
                return [
                                -1, 1, 89 
                        ]
        end

-       private meth action_table_row889: Array[Int]
+       private fun action_table_row889: Array[Int]

        do
                return [
                                -1, 1, 63 
                        ]
        end
        do
                return [
                                -1, 1, 63 
                        ]
        end

-       private meth action_table_row890: Array[Int]
+       private fun action_table_row890: Array[Int]

        do
                return [
                                -1, 1, 717 
                        ]
        end
        do
                return [
                                -1, 1, 717 
                        ]
        end

-       private meth action_table_row891: Array[Int]
+       private fun action_table_row891: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10837,13 +10837,13 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row892: Array[Int]
+       private fun action_table_row892: Array[Int]

        do
                return [
                                -1, 1, 88 
                        ]
        end
        do
                return [
                                -1, 1, 88 
                        ]
        end

-       private meth action_table_row893: Array[Int]
+       private fun action_table_row893: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10853,7 +10853,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row894: Array[Int]
+       private fun action_table_row894: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10863,7 +10863,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row895: Array[Int]
+       private fun action_table_row895: Array[Int]

        do
                return [
                                -1, 3, 894 ,
        do
                return [
                                -1, 3, 894 ,

@@ -10871,7 +10871,7 @@ abstract class ParserTable
                                19, 0, 1009 
                        ]
        end
                                19, 0, 1009 
                        ]
        end

-       private meth action_table_row896: Array[Int]
+       private fun action_table_row896: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10880,7 +10880,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row897: Array[Int]
+       private fun action_table_row897: Array[Int]

        do
                return [
                                -1, 3, 896 ,
        do
                return [
                                -1, 3, 896 ,

@@ -10888,7 +10888,7 @@ abstract class ParserTable
                                19, 0, 1012 
                        ]
        end
                                19, 0, 1012 
                        ]
        end

-       private meth action_table_row898: Array[Int]
+       private fun action_table_row898: Array[Int]

        do
                return [
                                -1, 3, 897 ,
        do
                return [
                                -1, 3, 897 ,

@@ -10908,21 +10908,21 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row899: Array[Int]
+       private fun action_table_row899: Array[Int]

        do
                return [
                                -1, 3, 898 ,
                                76, 0, 1014 
                        ]
        end
        do
                return [
                                -1, 3, 898 ,
                                76, 0, 1014 
                        ]
        end

-       private meth action_table_row900: Array[Int]
+       private fun action_table_row900: Array[Int]

        do
                return [
                                -1, 3, 899 ,
                                78, 0, 1015 
                        ]
        end
        do
                return [
                                -1, 3, 899 ,
                                78, 0, 1015 
                        ]
        end

-       private meth action_table_row901: Array[Int]
+       private fun action_table_row901: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -10946,14 +10946,14 @@ abstract class ParserTable
                                77, 0, 326 
                        ]
        end
                                77, 0, 326 
                        ]
        end

-       private meth action_table_row902: Array[Int]
+       private fun action_table_row902: Array[Int]

        do
                return [
                                -1, 3, 901 ,
                                78, 0, 1018 
                        ]
        end
        do
                return [
                                -1, 3, 901 ,
                                78, 0, 1018 
                        ]
        end

-       private meth action_table_row903: Array[Int]
+       private fun action_table_row903: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10963,7 +10963,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row904: Array[Int]
+       private fun action_table_row904: Array[Int]

        do
                return [
                                -1, 3, 903 ,
        do
                return [
                                -1, 3, 903 ,

@@ -10971,7 +10971,7 @@ abstract class ParserTable
                                19, 0, 1022 
                        ]
        end
                                19, 0, 1022 
                        ]
        end

-       private meth action_table_row905: Array[Int]
+       private fun action_table_row905: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -10980,7 +10980,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row906: Array[Int]
+       private fun action_table_row906: Array[Int]

        do
                return [
                                -1, 3, 905 ,
        do
                return [
                                -1, 3, 905 ,

@@ -10988,21 +10988,21 @@ abstract class ParserTable
                                19, 0, 1025 
                        ]
        end
                                19, 0, 1025 
                        ]
        end

-       private meth action_table_row907: Array[Int]
+       private fun action_table_row907: Array[Int]

        do
                return [
                                -1, 3, 906 ,
                                78, 0, 1026 
                        ]
        end
        do
                return [
                                -1, 3, 906 ,
                                78, 0, 1026 
                        ]
        end

-       private meth action_table_row908: Array[Int]
+       private fun action_table_row908: Array[Int]

        do
                return [
                                -1, 3, 907 ,
                                78, 0, 1027 
                        ]
        end
        do
                return [
                                -1, 3, 907 ,
                                78, 0, 1027 
                        ]
        end

-       private meth action_table_row909: Array[Int]
+       private fun action_table_row909: Array[Int]

        do
                return [
                                -1, 3, 908 ,
        do
                return [
                                -1, 3, 908 ,

@@ -11010,21 +11010,21 @@ abstract class ParserTable
                                19, 0, 1029 
                        ]
        end
                                19, 0, 1029 
                        ]
        end

-       private meth action_table_row910: Array[Int]
+       private fun action_table_row910: Array[Int]

        do
                return [
                                -1, 3, 909 ,
                                78, 0, 1030 
                        ]
        end
        do
                return [
                                -1, 3, 909 ,
                                78, 0, 1030 
                        ]
        end

-       private meth action_table_row911: Array[Int]
+       private fun action_table_row911: Array[Int]

        do
                return [
                                -1, 3, 910 ,
                                78, 0, 1031 
                        ]
        end
        do
                return [
                                -1, 3, 910 ,
                                78, 0, 1031 
                        ]
        end

-       private meth action_table_row912: Array[Int]
+       private fun action_table_row912: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11034,14 +11034,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row913: Array[Int]
+       private fun action_table_row913: Array[Int]

        do
                return [
                                -1, 3, 912 ,
                                56, 0, 258 
                        ]
        end
        do
                return [
                                -1, 3, 912 ,
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row914: Array[Int]
+       private fun action_table_row914: Array[Int]

        do
                return [
                                -1, 1, 110 ,
        do
                return [
                                -1, 1, 110 ,

@@ -11049,7 +11049,7 @@ abstract class ParserTable
                                58, 0, 1034 
                        ]
        end
                                58, 0, 1034 
                        ]
        end

-       private meth action_table_row915: Array[Int]
+       private fun action_table_row915: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11059,14 +11059,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row916: Array[Int]
+       private fun action_table_row916: Array[Int]

        do
                return [
                                -1, 3, 915 ,
                                16, 0, 1037 
                        ]
        end
        do
                return [
                                -1, 3, 915 ,
                                16, 0, 1037 
                        ]
        end

-       private meth action_table_row917: Array[Int]
+       private fun action_table_row917: Array[Int]

        do
                return [
                                -1, 1, 182 ,
        do
                return [
                                -1, 1, 182 ,

@@ -11074,7 +11074,7 @@ abstract class ParserTable
                                58, 0, 1038 
                        ]
        end
                                58, 0, 1038 
                        ]
        end

-       private meth action_table_row918: Array[Int]
+       private fun action_table_row918: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -11087,7 +11087,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row919: Array[Int]
+       private fun action_table_row919: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11095,7 +11095,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row920: Array[Int]
+       private fun action_table_row920: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11103,7 +11103,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row921: Array[Int]
+       private fun action_table_row921: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11111,14 +11111,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row922: Array[Int]
+       private fun action_table_row922: Array[Int]

        do
                return [
                                -1, 3, 921 ,
                                27, 0, 1044 
                        ]
        end
        do
                return [
                                -1, 3, 921 ,
                                27, 0, 1044 
                        ]
        end

-       private meth action_table_row923: Array[Int]
+       private fun action_table_row923: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11126,7 +11126,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row924: Array[Int]
+       private fun action_table_row924: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11134,7 +11134,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row925: Array[Int]
+       private fun action_table_row925: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -11147,7 +11147,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row926: Array[Int]
+       private fun action_table_row926: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11155,7 +11155,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row927: Array[Int]
+       private fun action_table_row927: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11163,19 +11163,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row928: Array[Int]
+       private fun action_table_row928: Array[Int]

        do
                return [
                                -1, 1, 62 
                        ]
        end
        do
                return [
                                -1, 1, 62 
                        ]
        end

-       private meth action_table_row929: Array[Int]
+       private fun action_table_row929: Array[Int]

        do
                return [
                                -1, 1, 65 
                        ]
        end
        do
                return [
                                -1, 1, 65 
                        ]
        end

-       private meth action_table_row930: Array[Int]
+       private fun action_table_row930: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -11188,7 +11188,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row931: Array[Int]
+       private fun action_table_row931: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -11201,7 +11201,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row932: Array[Int]
+       private fun action_table_row932: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11209,7 +11209,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row933: Array[Int]
+       private fun action_table_row933: Array[Int]

        do
                return [
                                -1, 3, 932 ,
        do
                return [
                                -1, 3, 932 ,

@@ -11243,7 +11243,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row934: Array[Int]
+       private fun action_table_row934: Array[Int]

        do
                return [
                                -1, 3, 933 ,
        do
                return [
                                -1, 3, 933 ,

@@ -11251,7 +11251,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row935: Array[Int]
+       private fun action_table_row935: Array[Int]

        do
                return [
                                -1, 3, 934 ,
        do
                return [
                                -1, 3, 934 ,

@@ -11279,7 +11279,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row936: Array[Int]
+       private fun action_table_row936: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11287,34 +11287,34 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row937: Array[Int]
+       private fun action_table_row937: Array[Int]

        do
                return [
                                -1, 3, 936 ,
                                26, 0, 1058 
                        ]
        end
        do
                return [
                                -1, 3, 936 ,
                                26, 0, 1058 
                        ]
        end

-       private meth action_table_row938: Array[Int]
+       private fun action_table_row938: Array[Int]

        do
                return [
                                -1, 3, 937 ,
                                16, 0, 1059 
                        ]
        end
        do
                return [
                                -1, 3, 937 ,
                                16, 0, 1059 
                        ]
        end

-       private meth action_table_row939: Array[Int]
+       private fun action_table_row939: Array[Int]

        do
                return [
                                -1, 3, 938 ,
                                30, 0, 1060 
                        ]
        end
        do
                return [
                                -1, 3, 938 ,
                                30, 0, 1060 
                        ]
        end

-       private meth action_table_row940: Array[Int]
+       private fun action_table_row940: Array[Int]

        do
                return [
                                -1, 1, 591 
                        ]
        end
        do
                return [
                                -1, 1, 591 
                        ]
        end

-       private meth action_table_row941: Array[Int]
+       private fun action_table_row941: Array[Int]

        do
                return [
                                -1, 3, 940 ,
        do
                return [
                                -1, 3, 940 ,

@@ -11324,25 +11324,25 @@ abstract class ParserTable
                                78, 0, 521 
                        ]
        end
                                78, 0, 521 
                        ]
        end

-       private meth action_table_row942: Array[Int]
+       private fun action_table_row942: Array[Int]

        do
                return [
                                -1, 1, 592 
                        ]
        end
        do
                return [
                                -1, 1, 592 
                        ]
        end

-       private meth action_table_row943: Array[Int]
+       private fun action_table_row943: Array[Int]

        do
                return [
                                -1, 1, 576 
                        ]
        end
        do
                return [
                                -1, 1, 576 
                        ]
        end

-       private meth action_table_row944: Array[Int]
+       private fun action_table_row944: Array[Int]

        do
                return [
                                -1, 1, 581 
                        ]
        end
        do
                return [
                                -1, 1, 581 
                        ]
        end

-       private meth action_table_row945: Array[Int]
+       private fun action_table_row945: Array[Int]

        do
                return [
                                -1, 3, 944 ,
        do
                return [
                                -1, 3, 944 ,

@@ -11378,7 +11378,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row946: Array[Int]
+       private fun action_table_row946: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11387,13 +11387,13 @@ abstract class ParserTable
                                16, 0, 1064 
                        ]
        end
                                16, 0, 1064 
                        ]
        end

-       private meth action_table_row947: Array[Int]
+       private fun action_table_row947: Array[Int]

        do
                return [
                                -1, 1, 566 
                        ]
        end
        do
                return [
                                -1, 1, 566 
                        ]
        end

-       private meth action_table_row948: Array[Int]
+       private fun action_table_row948: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -11422,7 +11422,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row949: Array[Int]
+       private fun action_table_row949: Array[Int]

        do
                return [
                                -1, 1, 451 ,
        do
                return [
                                -1, 1, 451 ,

@@ -11454,7 +11454,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row950: Array[Int]
+       private fun action_table_row950: Array[Int]

        do
                return [
                                -1, 1, 411 ,
        do
                return [
                                -1, 1, 411 ,

@@ -11463,25 +11463,25 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row951: Array[Int]
+       private fun action_table_row951: Array[Int]

        do
                return [
                                -1, 1, 577 
                        ]
        end
        do
                return [
                                -1, 1, 577 
                        ]
        end

-       private meth action_table_row952: Array[Int]
+       private fun action_table_row952: Array[Int]

        do
                return [
                                -1, 1, 582 
                        ]
        end
        do
                return [
                                -1, 1, 582 
                        ]
        end

-       private meth action_table_row953: Array[Int]
+       private fun action_table_row953: Array[Int]

        do
                return [
                                -1, 1, 365 
                        ]
        end
        do
                return [
                                -1, 1, 365 
                        ]
        end

-       private meth action_table_row954: Array[Int]
+       private fun action_table_row954: Array[Int]

        do
                return [
                                -1, 3, 953 ,
        do
                return [
                                -1, 3, 953 ,

@@ -11516,7 +11516,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row955: Array[Int]
+       private fun action_table_row955: Array[Int]

        do
                return [
                                -1, 3, 954 ,
        do
                return [
                                -1, 3, 954 ,

@@ -11552,26 +11552,26 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row956: Array[Int]
+       private fun action_table_row956: Array[Int]

        do
                return [
                                -1, 3, 955 ,
                                27, 0, 1072 
                        ]
        end
        do
                return [
                                -1, 3, 955 ,
                                27, 0, 1072 
                        ]
        end

-       private meth action_table_row957: Array[Int]
+       private fun action_table_row957: Array[Int]

        do
                return [
                                -1, 1, 303 
                        ]
        end
        do
                return [
                                -1, 1, 303 
                        ]
        end

-       private meth action_table_row958: Array[Int]
+       private fun action_table_row958: Array[Int]

        do
                return [
                                -1, 1, 306 
                        ]
        end
        do
                return [
                                -1, 1, 306 
                        ]
        end

-       private meth action_table_row959: Array[Int]
+       private fun action_table_row959: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11579,26 +11579,26 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row960: Array[Int]
+       private fun action_table_row960: Array[Int]

        do
                return [
                                -1, 1, 492 
                        ]
        end
        do
                return [
                                -1, 1, 492 
                        ]
        end

-       private meth action_table_row961: Array[Int]
+       private fun action_table_row961: Array[Int]

        do
                return [
                                -1, 3, 960 ,
                                76, 0, 1074 
                        ]
        end
        do
                return [
                                -1, 3, 960 ,
                                76, 0, 1074 
                        ]
        end

-       private meth action_table_row962: Array[Int]
+       private fun action_table_row962: Array[Int]

        do
                return [
                                -1, 1, 481 
                        ]
        end
        do
                return [
                                -1, 1, 481 
                        ]
        end

-       private meth action_table_row963: Array[Int]
+       private fun action_table_row963: Array[Int]

        do
                return [
                                -1, 1, 446 ,
        do
                return [
                                -1, 1, 446 ,

@@ -11606,13 +11606,13 @@ abstract class ParserTable
                                63, 0, 1075 
                        ]
        end
                                63, 0, 1075 
                        ]
        end

-       private meth action_table_row964: Array[Int]
+       private fun action_table_row964: Array[Int]

        do
                return [
                                -1, 1, 512 
                        ]
        end
        do
                return [
                                -1, 1, 512 
                        ]
        end

-       private meth action_table_row965: Array[Int]
+       private fun action_table_row965: Array[Int]

        do
                return [
                                -1, 3, 964 ,
        do
                return [
                                -1, 3, 964 ,

@@ -11620,7 +11620,7 @@ abstract class ParserTable
                                76, 0, 961 
                        ]
        end
                                76, 0, 961 
                        ]
        end

-       private meth action_table_row966: Array[Int]
+       private fun action_table_row966: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -11628,37 +11628,37 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row967: Array[Int]
+       private fun action_table_row967: Array[Int]

        do
                return [
                                -1, 1, 535 
                        ]
        end
        do
                return [
                                -1, 1, 535 
                        ]
        end

-       private meth action_table_row968: Array[Int]
+       private fun action_table_row968: Array[Int]

        do
                return [
                                -1, 1, 511 
                        ]
        end
        do
                return [
                                -1, 1, 511 
                        ]
        end

-       private meth action_table_row969: Array[Int]
+       private fun action_table_row969: Array[Int]

        do
                return [
                                -1, 1, 522 
                        ]
        end
        do
                return [
                                -1, 1, 522 
                        ]
        end

-       private meth action_table_row970: Array[Int]
+       private fun action_table_row970: Array[Int]

        do
                return [
                                -1, 1, 422 
                        ]
        end
        do
                return [
                                -1, 1, 422 
                        ]
        end

-       private meth action_table_row971: Array[Int]
+       private fun action_table_row971: Array[Int]

        do
                return [
                                -1, 1, 421 
                        ]
        end
        do
                return [
                                -1, 1, 421 
                        ]
        end

-       private meth action_table_row972: Array[Int]
+       private fun action_table_row972: Array[Int]

        do
                return [
                                -1, 3, 971 ,
        do
                return [
                                -1, 3, 971 ,

@@ -11684,7 +11684,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row973: Array[Int]
+       private fun action_table_row973: Array[Int]

        do
                return [
                                -1, 3, 972 ,
        do
                return [
                                -1, 3, 972 ,

@@ -11710,7 +11710,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row974: Array[Int]
+       private fun action_table_row974: Array[Int]

        do
                return [
                                -1, 3, 973 ,
        do
                return [
                                -1, 3, 973 ,

@@ -11735,7 +11735,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row975: Array[Int]
+       private fun action_table_row975: Array[Int]

        do
                return [
                                -1, 3, 974 ,
        do
                return [
                                -1, 3, 974 ,

@@ -11743,7 +11743,7 @@ abstract class ParserTable
                                76, 0, 961 
                        ]
        end
                                76, 0, 961 
                        ]
        end

-       private meth action_table_row976: Array[Int]
+       private fun action_table_row976: Array[Int]

        do
                return [
                                -1, 3, 975 ,
        do
                return [
                                -1, 3, 975 ,

@@ -11768,7 +11768,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row977: Array[Int]
+       private fun action_table_row977: Array[Int]

        do
                return [
                                -1, 3, 976 ,
        do
                return [
                                -1, 3, 976 ,

@@ -11793,7 +11793,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row978: Array[Int]
+       private fun action_table_row978: Array[Int]

        do
                return [
                                -1, 3, 977 ,
        do
                return [
                                -1, 3, 977 ,

@@ -11818,7 +11818,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row979: Array[Int]
+       private fun action_table_row979: Array[Int]

        do
                return [
                                -1, 3, 978 ,
        do
                return [
                                -1, 3, 978 ,

@@ -11843,7 +11843,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row980: Array[Int]
+       private fun action_table_row980: Array[Int]

        do
                return [
                                -1, 3, 979 ,
        do
                return [
                                -1, 3, 979 ,

@@ -11868,7 +11868,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row981: Array[Int]
+       private fun action_table_row981: Array[Int]

        do
                return [
                                -1, 3, 980 ,
        do
                return [
                                -1, 3, 980 ,

@@ -11893,7 +11893,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row982: Array[Int]
+       private fun action_table_row982: Array[Int]

        do
                return [
                                -1, 3, 981 ,
        do
                return [
                                -1, 3, 981 ,

@@ -11918,7 +11918,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row983: Array[Int]
+       private fun action_table_row983: Array[Int]

        do
                return [
                                -1, 3, 982 ,
        do
                return [
                                -1, 3, 982 ,

@@ -11943,7 +11943,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row984: Array[Int]
+       private fun action_table_row984: Array[Int]

        do
                return [
                                -1, 3, 983 ,
        do
                return [
                                -1, 3, 983 ,

@@ -11968,7 +11968,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row985: Array[Int]
+       private fun action_table_row985: Array[Int]

        do
                return [
                                -1, 3, 984 ,
        do
                return [
                                -1, 3, 984 ,

@@ -11993,7 +11993,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row986: Array[Int]
+       private fun action_table_row986: Array[Int]

        do
                return [
                                -1, 3, 985 ,
        do
                return [
                                -1, 3, 985 ,

@@ -12018,7 +12018,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row987: Array[Int]
+       private fun action_table_row987: Array[Int]

        do
                return [
                                -1, 3, 986 ,
        do
                return [
                                -1, 3, 986 ,

@@ -12043,7 +12043,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row988: Array[Int]
+       private fun action_table_row988: Array[Int]

        do
                return [
                                -1, 3, 987 ,
        do
                return [
                                -1, 3, 987 ,

@@ -12053,7 +12053,7 @@ abstract class ParserTable
                                78, 0, 1098 
                        ]
        end
                                78, 0, 1098 
                        ]
        end

-       private meth action_table_row989: Array[Int]
+       private fun action_table_row989: Array[Int]

        do
                return [
                                -1, 1, 343 ,
        do
                return [
                                -1, 1, 343 ,

@@ -12087,19 +12087,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row990: Array[Int]
+       private fun action_table_row990: Array[Int]

        do
                return [
                                -1, 1, 291 
                        ]
        end
        do
                return [
                                -1, 1, 291 
                        ]
        end

-       private meth action_table_row991: Array[Int]
+       private fun action_table_row991: Array[Int]

        do
                return [
                                -1, 1, 289 
                        ]
        end
        do
                return [
                                -1, 1, 289 
                        ]
        end

-       private meth action_table_row992: Array[Int]
+       private fun action_table_row992: Array[Int]

        do
                return [
                                -1, 3, 991 ,
        do
                return [
                                -1, 3, 991 ,

@@ -12108,7 +12108,7 @@ abstract class ParserTable
                                16, 0, 1099 
                        ]
        end
                                16, 0, 1099 
                        ]
        end

-       private meth action_table_row993: Array[Int]
+       private fun action_table_row993: Array[Int]

        do
                return [
                                -1, 3, 992 ,
        do
                return [
                                -1, 3, 992 ,

@@ -12144,51 +12144,51 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row994: Array[Int]
+       private fun action_table_row994: Array[Int]

        do
                return [
                                -1, 1, 296 
                        ]
        end
        do
                return [
                                -1, 1, 296 
                        ]
        end

-       private meth action_table_row995: Array[Int]
+       private fun action_table_row995: Array[Int]

        do
                return [
                                -1, 1, 287 
                        ]
        end
        do
                return [
                                -1, 1, 287 
                        ]
        end

-       private meth action_table_row996: Array[Int]
+       private fun action_table_row996: Array[Int]

        do
                return [
                                -1, 3, 995 ,
                                76, 0, 758 
                        ]
        end
        do
                return [
                                -1, 3, 995 ,
                                76, 0, 758 
                        ]
        end

-       private meth action_table_row997: Array[Int]
+       private fun action_table_row997: Array[Int]

        do
                return [
                                -1, 1, 83 
                        ]
        end
        do
                return [
                                -1, 1, 83 
                        ]
        end

-       private meth action_table_row998: Array[Int]
+       private fun action_table_row998: Array[Int]

        do
                return [
                                -1, 1, 715 
                        ]
        end
        do
                return [
                                -1, 1, 715 
                        ]
        end

-       private meth action_table_row999: Array[Int]
+       private fun action_table_row999: Array[Int]

        do
                return [
                                -1, 3, 998 ,
                                54, 0, 1103 
                        ]
        end
        do
                return [
                                -1, 3, 998 ,
                                54, 0, 1103 
                        ]
        end

-       private meth action_table_row1000: Array[Int]
+       private fun action_table_row1000: Array[Int]

        do
                return [
                                -1, 1, 67 
                        ]
        end
        do
                return [
                                -1, 1, 67 
                        ]
        end

-       private meth action_table_row1001: Array[Int]
+       private fun action_table_row1001: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12201,7 +12201,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1002: Array[Int]
+       private fun action_table_row1002: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12214,7 +12214,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1003: Array[Int]
+       private fun action_table_row1003: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12222,13 +12222,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1004: Array[Int]
+       private fun action_table_row1004: Array[Int]

        do
                return [
                                -1, 1, 64 
                        ]
        end
        do
                return [
                                -1, 1, 64 
                        ]
        end

-       private meth action_table_row1005: Array[Int]
+       private fun action_table_row1005: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12238,7 +12238,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1006: Array[Int]
+       private fun action_table_row1006: Array[Int]

        do
                return [
                                -1, 3, 1005 ,
        do
                return [
                                -1, 3, 1005 ,

@@ -12246,7 +12246,7 @@ abstract class ParserTable
                                19, 0, 1110 
                        ]
        end
                                19, 0, 1110 
                        ]
        end

-       private meth action_table_row1007: Array[Int]
+       private fun action_table_row1007: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12255,7 +12255,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1008: Array[Int]
+       private fun action_table_row1008: Array[Int]

        do
                return [
                                -1, 3, 1007 ,
        do
                return [
                                -1, 3, 1007 ,

@@ -12263,21 +12263,21 @@ abstract class ParserTable
                                19, 0, 1113 
                        ]
        end
                                19, 0, 1113 
                        ]
        end

-       private meth action_table_row1009: Array[Int]
+       private fun action_table_row1009: Array[Int]

        do
                return [
                                -1, 3, 1008 ,
                                78, 0, 1114 
                        ]
        end
        do
                return [
                                -1, 3, 1008 ,
                                78, 0, 1114 
                        ]
        end

-       private meth action_table_row1010: Array[Int]
+       private fun action_table_row1010: Array[Int]

        do
                return [
                                -1, 3, 1009 ,
                                78, 0, 1115 
                        ]
        end
        do
                return [
                                -1, 3, 1009 ,
                                78, 0, 1115 
                        ]
        end

-       private meth action_table_row1011: Array[Int]
+       private fun action_table_row1011: Array[Int]

        do
                return [
                                -1, 3, 1010 ,
        do
                return [
                                -1, 3, 1010 ,

@@ -12285,21 +12285,21 @@ abstract class ParserTable
                                19, 0, 1117 
                        ]
        end
                                19, 0, 1117 
                        ]
        end

-       private meth action_table_row1012: Array[Int]
+       private fun action_table_row1012: Array[Int]

        do
                return [
                                -1, 3, 1011 ,
                                78, 0, 1118 
                        ]
        end
        do
                return [
                                -1, 3, 1011 ,
                                78, 0, 1118 
                        ]
        end

-       private meth action_table_row1013: Array[Int]
+       private fun action_table_row1013: Array[Int]

        do
                return [
                                -1, 3, 1012 ,
                                78, 0, 1119 
                        ]
        end
        do
                return [
                                -1, 3, 1012 ,
                                78, 0, 1119 
                        ]
        end

-       private meth action_table_row1014: Array[Int]
+       private fun action_table_row1014: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12309,14 +12309,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row1015: Array[Int]
+       private fun action_table_row1015: Array[Int]

        do
                return [
                                -1, 3, 1014 ,
                                56, 0, 258 
                        ]
        end
        do
                return [
                                -1, 3, 1014 ,
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row1016: Array[Int]
+       private fun action_table_row1016: Array[Int]

        do
                return [
                                -1, 1, 119 ,
        do
                return [
                                -1, 1, 119 ,

@@ -12324,7 +12324,7 @@ abstract class ParserTable
                                58, 0, 1122 
                        ]
        end
                                58, 0, 1122 
                        ]
        end

-       private meth action_table_row1017: Array[Int]
+       private fun action_table_row1017: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12334,14 +12334,14 @@ abstract class ParserTable
                                56, 0, 258 
                        ]
        end
                                56, 0, 258 
                        ]
        end

-       private meth action_table_row1018: Array[Int]
+       private fun action_table_row1018: Array[Int]

        do
                return [
                                -1, 3, 1017 ,
                                16, 0, 1125 
                        ]
        end
        do
                return [
                                -1, 3, 1017 ,
                                16, 0, 1125 
                        ]
        end

-       private meth action_table_row1019: Array[Int]
+       private fun action_table_row1019: Array[Int]

        do
                return [
                                -1, 1, 191 ,
        do
                return [
                                -1, 1, 191 ,

@@ -12349,7 +12349,7 @@ abstract class ParserTable
                                58, 0, 1126 
                        ]
        end
                                58, 0, 1126 
                        ]
        end

-       private meth action_table_row1020: Array[Int]
+       private fun action_table_row1020: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12358,7 +12358,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1021: Array[Int]
+       private fun action_table_row1021: Array[Int]

        do
                return [
                                -1, 3, 1020 ,
        do
                return [
                                -1, 3, 1020 ,

@@ -12366,21 +12366,21 @@ abstract class ParserTable
                                19, 0, 1130 
                        ]
        end
                                19, 0, 1130 
                        ]
        end

-       private meth action_table_row1022: Array[Int]
+       private fun action_table_row1022: Array[Int]

        do
                return [
                                -1, 3, 1021 ,
                                78, 0, 1131 
                        ]
        end
        do
                return [
                                -1, 3, 1021 ,
                                78, 0, 1131 
                        ]
        end

-       private meth action_table_row1023: Array[Int]
+       private fun action_table_row1023: Array[Int]

        do
                return [
                                -1, 3, 1022 ,
                                78, 0, 1132 
                        ]
        end
        do
                return [
                                -1, 3, 1022 ,
                                78, 0, 1132 
                        ]
        end

-       private meth action_table_row1024: Array[Int]
+       private fun action_table_row1024: Array[Int]

        do
                return [
                                -1, 3, 1023 ,
        do
                return [
                                -1, 3, 1023 ,

@@ -12388,21 +12388,21 @@ abstract class ParserTable
                                19, 0, 1134 
                        ]
        end
                                19, 0, 1134 
                        ]
        end

-       private meth action_table_row1025: Array[Int]
+       private fun action_table_row1025: Array[Int]

        do
                return [
                                -1, 3, 1024 ,
                                78, 0, 1135 
                        ]
        end
        do
                return [
                                -1, 3, 1024 ,
                                78, 0, 1135 
                        ]
        end

-       private meth action_table_row1026: Array[Int]
+       private fun action_table_row1026: Array[Int]

        do
                return [
                                -1, 3, 1025 ,
                                78, 0, 1136 
                        ]
        end
        do
                return [
                                -1, 3, 1025 ,
                                78, 0, 1136 
                        ]
        end

-       private meth action_table_row1027: Array[Int]
+       private fun action_table_row1027: Array[Int]

        do
                return [
                                -1, 1, 104 ,
        do
                return [
                                -1, 1, 104 ,

@@ -12410,7 +12410,7 @@ abstract class ParserTable
                                58, 0, 1137 
                        ]
        end
                                58, 0, 1137 
                        ]
        end

-       private meth action_table_row1028: Array[Int]
+       private fun action_table_row1028: Array[Int]

        do
                return [
                                -1, 1, 176 ,
        do
                return [
                                -1, 1, 176 ,

@@ -12418,21 +12418,21 @@ abstract class ParserTable
                                58, 0, 1139 
                        ]
        end
                                58, 0, 1139 
                        ]
        end

-       private meth action_table_row1029: Array[Int]
+       private fun action_table_row1029: Array[Int]

        do
                return [
                                -1, 3, 1028 ,
                                78, 0, 1141 
                        ]
        end
        do
                return [
                                -1, 3, 1028 ,
                                78, 0, 1141 
                        ]
        end

-       private meth action_table_row1030: Array[Int]
+       private fun action_table_row1030: Array[Int]

        do
                return [
                                -1, 3, 1029 ,
                                78, 0, 1142 
                        ]
        end
        do
                return [
                                -1, 3, 1029 ,
                                78, 0, 1142 
                        ]
        end

-       private meth action_table_row1031: Array[Int]
+       private fun action_table_row1031: Array[Int]

        do
                return [
                                -1, 1, 108 ,
        do
                return [
                                -1, 1, 108 ,

@@ -12440,7 +12440,7 @@ abstract class ParserTable
                                58, 0, 1143 
                        ]
        end
                                58, 0, 1143 
                        ]
        end

-       private meth action_table_row1032: Array[Int]
+       private fun action_table_row1032: Array[Int]

        do
                return [
                                -1, 1, 180 ,
        do
                return [
                                -1, 1, 180 ,

@@ -12448,7 +12448,7 @@ abstract class ParserTable
                                58, 0, 1145 
                        ]
        end
                                58, 0, 1145 
                        ]
        end

-       private meth action_table_row1033: Array[Int]
+       private fun action_table_row1033: Array[Int]

        do
                return [
                                -1, 3, 1032 ,
        do
                return [
                                -1, 3, 1032 ,

@@ -12456,13 +12456,13 @@ abstract class ParserTable
                                16, 0, 1148 
                        ]
        end
                                16, 0, 1148 
                        ]
        end

-       private meth action_table_row1034: Array[Int]
+       private fun action_table_row1034: Array[Int]

        do
                return [
                                -1, 1, 254 
                        ]
        end
        do
                return [
                                -1, 1, 254 
                        ]
        end

-       private meth action_table_row1035: Array[Int]
+       private fun action_table_row1035: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12470,21 +12470,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1036: Array[Int]
+       private fun action_table_row1036: Array[Int]

        do
                return [
                                -1, 1, 128 ,
                                58, 0, 1150 
                        ]
        end
        do
                return [
                                -1, 1, 128 ,
                                58, 0, 1150 
                        ]
        end

-       private meth action_table_row1037: Array[Int]
+       private fun action_table_row1037: Array[Int]

        do
                return [
                                -1, 3, 1036 ,
                                16, 0, 1151 
                        ]
        end
        do
                return [
                                -1, 3, 1036 ,
                                16, 0, 1151 
                        ]
        end

-       private meth action_table_row1038: Array[Int]
+       private fun action_table_row1038: Array[Int]

        do
                return [
                                -1, 3, 1037 ,
        do
                return [
                                -1, 3, 1037 ,

@@ -12520,7 +12520,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1039: Array[Int]
+       private fun action_table_row1039: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12528,20 +12528,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1040: Array[Int]
+       private fun action_table_row1040: Array[Int]

        do
                return [
                                -1, 1, 200 ,
                                58, 0, 1154 
                        ]
        end
        do
                return [
                                -1, 1, 200 ,
                                58, 0, 1154 
                        ]
        end

-       private meth action_table_row1041: Array[Int]
+       private fun action_table_row1041: Array[Int]

        do
                return [
                                -1, 1, 71 
                        ]
        end
        do
                return [
                                -1, 1, 71 
                        ]
        end

-       private meth action_table_row1042: Array[Int]
+       private fun action_table_row1042: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12554,21 +12554,21 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1043: Array[Int]
+       private fun action_table_row1043: Array[Int]

        do
                return [
                                -1, 3, 1042 ,
                                46, 0, 1156 
                        ]
        end
        do
                return [
                                -1, 3, 1042 ,
                                46, 0, 1156 
                        ]
        end

-       private meth action_table_row1044: Array[Int]
+       private fun action_table_row1044: Array[Int]

        do
                return [
                                -1, 3, 1043 ,
                                52, 0, 1157 
                        ]
        end
        do
                return [
                                -1, 3, 1043 ,
                                52, 0, 1157 
                        ]
        end

-       private meth action_table_row1045: Array[Int]
+       private fun action_table_row1045: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12576,27 +12576,27 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1046: Array[Int]
+       private fun action_table_row1046: Array[Int]

        do
                return [
                                -1, 3, 1045 ,
                                46, 0, 1159 
                        ]
        end
        do
                return [
                                -1, 3, 1045 ,
                                46, 0, 1159 
                        ]
        end

-       private meth action_table_row1047: Array[Int]
+       private fun action_table_row1047: Array[Int]

        do
                return [
                                -1, 3, 1046 ,
                                52, 0, 1160 
                        ]
        end
        do
                return [
                                -1, 3, 1046 ,
                                52, 0, 1160 
                        ]
        end

-       private meth action_table_row1048: Array[Int]
+       private fun action_table_row1048: Array[Int]

        do
                return [
                                -1, 1, 69 
                        ]
        end
        do
                return [
                                -1, 1, 69 
                        ]
        end

-       private meth action_table_row1049: Array[Int]
+       private fun action_table_row1049: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12609,7 +12609,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1050: Array[Int]
+       private fun action_table_row1050: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12622,7 +12622,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1051: Array[Int]
+       private fun action_table_row1051: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12630,19 +12630,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1052: Array[Int]
+       private fun action_table_row1052: Array[Int]

        do
                return [
                                -1, 1, 66 
                        ]
        end
        do
                return [
                                -1, 1, 66 
                        ]
        end

-       private meth action_table_row1053: Array[Int]
+       private fun action_table_row1053: Array[Int]

        do
                return [
                                -1, 1, 73 
                        ]
        end
        do
                return [
                                -1, 1, 73 
                        ]
        end

-       private meth action_table_row1054: Array[Int]
+       private fun action_table_row1054: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -12655,14 +12655,14 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1055: Array[Int]
+       private fun action_table_row1055: Array[Int]

        do
                return [
                                -1, 1, 309 ,
                                27, 1, 539 
                        ]
        end
        do
                return [
                                -1, 1, 309 ,
                                27, 1, 539 
                        ]
        end

-       private meth action_table_row1056: Array[Int]
+       private fun action_table_row1056: Array[Int]

        do
                return [
                                -1, 3, 1055 ,
        do
                return [
                                -1, 3, 1055 ,

@@ -12696,13 +12696,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1057: Array[Int]
+       private fun action_table_row1057: Array[Int]

        do
                return [
                                -1, 1, 571 
                        ]
        end
        do
                return [
                                -1, 1, 571 
                        ]
        end

-       private meth action_table_row1058: Array[Int]
+       private fun action_table_row1058: Array[Int]

        do
                return [
                                -1, 3, 1057 ,
        do
                return [
                                -1, 3, 1057 ,

@@ -12730,7 +12730,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1059: Array[Int]
+       private fun action_table_row1059: Array[Int]

        do
                return [
                                -1, 3, 1058 ,
        do
                return [
                                -1, 3, 1058 ,

@@ -12767,7 +12767,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1060: Array[Int]
+       private fun action_table_row1060: Array[Int]

        do
                return [
                                -1, 3, 1059 ,
        do
                return [
                                -1, 3, 1059 ,

@@ -12803,7 +12803,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1061: Array[Int]
+       private fun action_table_row1061: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12811,14 +12811,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1062: Array[Int]
+       private fun action_table_row1062: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row1063: Array[Int]
+       private fun action_table_row1063: Array[Int]

        do
                return [
                                -1, 1, 344 ,
        do
                return [
                                -1, 1, 344 ,

@@ -12852,13 +12852,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1064: Array[Int]
+       private fun action_table_row1064: Array[Int]

        do
                return [
                                -1, 1, 567 
                        ]
        end
        do
                return [
                                -1, 1, 567 
                        ]
        end

-       private meth action_table_row1065: Array[Int]
+       private fun action_table_row1065: Array[Int]

        do
                return [
                                -1, 3, 1064 ,
        do
                return [
                                -1, 3, 1064 ,

@@ -12894,14 +12894,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1066: Array[Int]
+       private fun action_table_row1066: Array[Int]

        do
                return [
                                -1, 1, 334 ,
                                27, 1, 563 
                        ]
        end
        do
                return [
                                -1, 1, 334 ,
                                27, 1, 563 
                        ]
        end

-       private meth action_table_row1067: Array[Int]
+       private fun action_table_row1067: Array[Int]

        do
                return [
                                -1, 1, 413 ,
        do
                return [
                                -1, 1, 413 ,

@@ -12910,7 +12910,7 @@ abstract class ParserTable
                                60, 0, 178 
                        ]
        end
                                60, 0, 178 
                        ]
        end

-       private meth action_table_row1068: Array[Int]
+       private fun action_table_row1068: Array[Int]

        do
                return [
                                -1, 1, 328 ,
        do
                return [
                                -1, 1, 328 ,

@@ -12918,7 +12918,7 @@ abstract class ParserTable
                                48, 0, 814 
                        ]
        end
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row1069: Array[Int]
+       private fun action_table_row1069: Array[Int]

        do
                return [
                                -1, 3, 1068 ,
        do
                return [
                                -1, 3, 1068 ,

@@ -12946,7 +12946,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1070: Array[Int]
+       private fun action_table_row1070: Array[Int]

        do
                return [
                                -1, 3, 1069 ,
        do
                return [
                                -1, 3, 1069 ,

@@ -12974,19 +12974,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1071: Array[Int]
+       private fun action_table_row1071: Array[Int]

        do
                return [
                                -1, 1, 366 
                        ]
        end
        do
                return [
                                -1, 1, 366 
                        ]
        end

-       private meth action_table_row1072: Array[Int]
+       private fun action_table_row1072: Array[Int]

        do
                return [
                                -1, 1, 372 
                        ]
        end
        do
                return [
                                -1, 1, 372 
                        ]
        end

-       private meth action_table_row1073: Array[Int]
+       private fun action_table_row1073: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -12994,20 +12994,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1074: Array[Int]
+       private fun action_table_row1074: Array[Int]

        do
                return [
                                -1, 3, 1073 ,
                                26, 0, 1180 
                        ]
        end
        do
                return [
                                -1, 3, 1073 ,
                                26, 0, 1180 
                        ]
        end

-       private meth action_table_row1075: Array[Int]
+       private fun action_table_row1075: Array[Int]

        do
                return [
                                -1, 1, 482 
                        ]
        end
        do
                return [
                                -1, 1, 482 
                        ]
        end

-       private meth action_table_row1076: Array[Int]
+       private fun action_table_row1076: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13015,20 +13015,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1077: Array[Int]
+       private fun action_table_row1077: Array[Int]

        do
                return [
                                -1, 1, 514 
                        ]
        end
        do
                return [
                                -1, 1, 514 
                        ]
        end

-       private meth action_table_row1078: Array[Int]
+       private fun action_table_row1078: Array[Int]

        do
                return [
                                -1, 3, 1077 ,
                                63, 0, 1075 
                        ]
        end
        do
                return [
                                -1, 3, 1077 ,
                                63, 0, 1075 
                        ]
        end

-       private meth action_table_row1079: Array[Int]
+       private fun action_table_row1079: Array[Int]

        do
                return [
                                -1, 3, 1078 ,
        do
                return [
                                -1, 3, 1078 ,

@@ -13038,19 +13038,19 @@ abstract class ParserTable
                                78, 0, 1182 
                        ]
        end
                                78, 0, 1182 
                        ]
        end

-       private meth action_table_row1080: Array[Int]
+       private fun action_table_row1080: Array[Int]

        do
                return [
                                -1, 1, 490 
                        ]
        end
        do
                return [
                                -1, 1, 490 
                        ]
        end

-       private meth action_table_row1081: Array[Int]
+       private fun action_table_row1081: Array[Int]

        do
                return [
                                -1, 1, 489 
                        ]
        end
        do
                return [
                                -1, 1, 489 
                        ]
        end

-       private meth action_table_row1082: Array[Int]
+       private fun action_table_row1082: Array[Int]

        do
                return [
                                -1, 1, 495 ,
        do
                return [
                                -1, 1, 495 ,

@@ -13058,13 +13058,13 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1083: Array[Int]
+       private fun action_table_row1083: Array[Int]

        do
                return [
                                -1, 1, 502 
                        ]
        end
        do
                return [
                                -1, 1, 502 
                        ]
        end

-       private meth action_table_row1084: Array[Int]
+       private fun action_table_row1084: Array[Int]

        do
                return [
                                -1, 1, 504 ,
        do
                return [
                                -1, 1, 504 ,

@@ -13073,7 +13073,7 @@ abstract class ParserTable
                                68, 0, 863 
                        ]
        end
                                68, 0, 863 
                        ]
        end

-       private meth action_table_row1085: Array[Int]
+       private fun action_table_row1085: Array[Int]

        do
                return [
                                -1, 1, 505 ,
        do
                return [
                                -1, 1, 505 ,

@@ -13082,7 +13082,7 @@ abstract class ParserTable
                                68, 0, 863 
                        ]
        end
                                68, 0, 863 
                        ]
        end

-       private meth action_table_row1086: Array[Int]
+       private fun action_table_row1086: Array[Int]

        do
                return [
                                -1, 1, 494 ,
        do
                return [
                                -1, 1, 494 ,

@@ -13090,7 +13090,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1087: Array[Int]
+       private fun action_table_row1087: Array[Int]

        do
                return [
                                -1, 1, 496 ,
        do
                return [
                                -1, 1, 496 ,

@@ -13098,7 +13098,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1088: Array[Int]
+       private fun action_table_row1088: Array[Int]

        do
                return [
                                -1, 1, 497 ,
        do
                return [
                                -1, 1, 497 ,

@@ -13106,7 +13106,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1089: Array[Int]
+       private fun action_table_row1089: Array[Int]

        do
                return [
                                -1, 1, 498 ,
        do
                return [
                                -1, 1, 498 ,

@@ -13114,7 +13114,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1090: Array[Int]
+       private fun action_table_row1090: Array[Int]

        do
                return [
                                -1, 1, 499 ,
        do
                return [
                                -1, 1, 499 ,

@@ -13122,7 +13122,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1091: Array[Int]
+       private fun action_table_row1091: Array[Int]

        do
                return [
                                -1, 1, 500 ,
        do
                return [
                                -1, 1, 500 ,

@@ -13130,7 +13130,7 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1092: Array[Int]
+       private fun action_table_row1092: Array[Int]

        do
                return [
                                -1, 1, 501 ,
        do
                return [
                                -1, 1, 501 ,

@@ -13138,32 +13138,32 @@ abstract class ParserTable
                                65, 0, 853 
                        ]
        end
                                65, 0, 853 
                        ]
        end

-       private meth action_table_row1093: Array[Int]
+       private fun action_table_row1093: Array[Int]

        do
                return [
                                -1, 1, 507 
                        ]
        end
        do
                return [
                                -1, 1, 507 
                        ]
        end

-       private meth action_table_row1094: Array[Int]
+       private fun action_table_row1094: Array[Int]

        do
                return [
                                -1, 1, 508 
                        ]
        end
        do
                return [
                                -1, 1, 508 
                        ]
        end

-       private meth action_table_row1095: Array[Int]
+       private fun action_table_row1095: Array[Int]

        do
                return [
                                -1, 1, 509 
                        ]
        end
        do
                return [
                                -1, 1, 509 
                        ]
        end

-       private meth action_table_row1096: Array[Int]
+       private fun action_table_row1096: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row1097: Array[Int]
+       private fun action_table_row1097: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13171,20 +13171,20 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1098: Array[Int]
+       private fun action_table_row1098: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row1099: Array[Int]
+       private fun action_table_row1099: Array[Int]

        do
                return [
                                -1, 1, 517 
                        ]
        end
        do
                return [
                                -1, 1, 517 
                        ]
        end

-       private meth action_table_row1100: Array[Int]
+       private fun action_table_row1100: Array[Int]

        do
                return [
                                -1, 3, 1099 ,
        do
                return [
                                -1, 3, 1099 ,

@@ -13220,13 +13220,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1101: Array[Int]
+       private fun action_table_row1101: Array[Int]

        do
                return [
                                -1, 1, 297 
                        ]
        end
        do
                return [
                                -1, 1, 297 
                        ]
        end

-       private meth action_table_row1102: Array[Int]
+       private fun action_table_row1102: Array[Int]

        do
                return [
                                -1, 3, 1101 ,
        do
                return [
                                -1, 3, 1101 ,

@@ -13234,31 +13234,31 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1103: Array[Int]
+       private fun action_table_row1103: Array[Int]

        do
                return [
                                -1, 1, 85 
                        ]
        end
        do
                return [
                                -1, 1, 85 
                        ]
        end

-       private meth action_table_row1104: Array[Int]
+       private fun action_table_row1104: Array[Int]

        do
                return [
                                -1, 1, 84 
                        ]
        end
        do
                return [
                                -1, 1, 84 
                        ]
        end

-       private meth action_table_row1105: Array[Int]
+       private fun action_table_row1105: Array[Int]

        do
                return [
                                -1, 1, 68 
                        ]
        end
        do
                return [
                                -1, 1, 68 
                        ]
        end

-       private meth action_table_row1106: Array[Int]
+       private fun action_table_row1106: Array[Int]

        do
                return [
                                -1, 1, 75 
                        ]
        end
        do
                return [
                                -1, 1, 75 
                        ]
        end

-       private meth action_table_row1107: Array[Int]
+       private fun action_table_row1107: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -13271,7 +13271,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1108: Array[Int]
+       private fun action_table_row1108: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -13280,7 +13280,7 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1109: Array[Int]
+       private fun action_table_row1109: Array[Int]

        do
                return [
                                -1, 3, 1108 ,
        do
                return [
                                -1, 3, 1108 ,

@@ -13288,21 +13288,21 @@ abstract class ParserTable
                                19, 0, 1191 
                        ]
        end
                                19, 0, 1191 
                        ]
        end

-       private meth action_table_row1110: Array[Int]
+       private fun action_table_row1110: Array[Int]

        do
                return [
                                -1, 3, 1109 ,
                                78, 0, 1192 
                        ]
        end
        do
                return [
                                -1, 3, 1109 ,
                                78, 0, 1192 
                        ]
        end

-       private meth action_table_row1111: Array[Int]
+       private fun action_table_row1111: Array[Int]

        do
                return [
                                -1, 3, 1110 ,
                                78, 0, 1193 
                        ]
        end
        do
                return [
                                -1, 3, 1110 ,
                                78, 0, 1193 
                        ]
        end

-       private meth action_table_row1112: Array[Int]
+       private fun action_table_row1112: Array[Int]

        do
                return [
                                -1, 3, 1111 ,
        do
                return [
                                -1, 3, 1111 ,

@@ -13310,21 +13310,21 @@ abstract class ParserTable
                                19, 0, 1195 
                        ]
        end
                                19, 0, 1195 
                        ]
        end

-       private meth action_table_row1113: Array[Int]
+       private fun action_table_row1113: Array[Int]

        do
                return [
                                -1, 3, 1112 ,
                                78, 0, 1196 
                        ]
        end
        do
                return [
                                -1, 3, 1112 ,
                                78, 0, 1196 
                        ]
        end

-       private meth action_table_row1114: Array[Int]
+       private fun action_table_row1114: Array[Int]

        do
                return [
                                -1, 3, 1113 ,
                                78, 0, 1197 
                        ]
        end
        do
                return [
                                -1, 3, 1113 ,
                                78, 0, 1197 
                        ]
        end

-       private meth action_table_row1115: Array[Int]
+       private fun action_table_row1115: Array[Int]

        do
                return [
                                -1, 1, 107 ,
        do
                return [
                                -1, 1, 107 ,

@@ -13332,7 +13332,7 @@ abstract class ParserTable
                                58, 0, 1198 
                        ]
        end
                                58, 0, 1198 
                        ]
        end

-       private meth action_table_row1116: Array[Int]
+       private fun action_table_row1116: Array[Int]

        do
                return [
                                -1, 1, 179 ,
        do
                return [
                                -1, 1, 179 ,

@@ -13340,21 +13340,21 @@ abstract class ParserTable
                                58, 0, 1200 
                        ]
        end
                                58, 0, 1200 
                        ]
        end

-       private meth action_table_row1117: Array[Int]
+       private fun action_table_row1117: Array[Int]

        do
                return [
                                -1, 3, 1116 ,
                                78, 0, 1202 
                        ]
        end
        do
                return [
                                -1, 3, 1116 ,
                                78, 0, 1202 
                        ]
        end

-       private meth action_table_row1118: Array[Int]
+       private fun action_table_row1118: Array[Int]

        do
                return [
                                -1, 3, 1117 ,
                                78, 0, 1203 
                        ]
        end
        do
                return [
                                -1, 3, 1117 ,
                                78, 0, 1203 
                        ]
        end

-       private meth action_table_row1119: Array[Int]
+       private fun action_table_row1119: Array[Int]

        do
                return [
                                -1, 1, 109 ,
        do
                return [
                                -1, 1, 109 ,

@@ -13362,7 +13362,7 @@ abstract class ParserTable
                                58, 0, 1204 
                        ]
        end
                                58, 0, 1204 
                        ]
        end

-       private meth action_table_row1120: Array[Int]
+       private fun action_table_row1120: Array[Int]

        do
                return [
                                -1, 1, 181 ,
        do
                return [
                                -1, 1, 181 ,

@@ -13370,7 +13370,7 @@ abstract class ParserTable
                                58, 0, 1206 
                        ]
        end
                                58, 0, 1206 
                        ]
        end

-       private meth action_table_row1121: Array[Int]
+       private fun action_table_row1121: Array[Int]

        do
                return [
                                -1, 3, 1120 ,
        do
                return [
                                -1, 3, 1120 ,

@@ -13378,13 +13378,13 @@ abstract class ParserTable
                                16, 0, 1209 
                        ]
        end
                                16, 0, 1209 
                        ]
        end

-       private meth action_table_row1122: Array[Int]
+       private fun action_table_row1122: Array[Int]

        do
                return [
                                -1, 1, 255 
                        ]
        end
        do
                return [
                                -1, 1, 255 
                        ]
        end

-       private meth action_table_row1123: Array[Int]
+       private fun action_table_row1123: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13392,21 +13392,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1124: Array[Int]
+       private fun action_table_row1124: Array[Int]

        do
                return [
                                -1, 1, 137 ,
                                58, 0, 1211 
                        ]
        end
        do
                return [
                                -1, 1, 137 ,
                                58, 0, 1211 
                        ]
        end

-       private meth action_table_row1125: Array[Int]
+       private fun action_table_row1125: Array[Int]

        do
                return [
                                -1, 3, 1124 ,
                                16, 0, 1212 
                        ]
        end
        do
                return [
                                -1, 3, 1124 ,
                                16, 0, 1212 
                        ]
        end

-       private meth action_table_row1126: Array[Int]
+       private fun action_table_row1126: Array[Int]

        do
                return [
                                -1, 3, 1125 ,
        do
                return [
                                -1, 3, 1125 ,

@@ -13442,7 +13442,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1127: Array[Int]
+       private fun action_table_row1127: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13450,14 +13450,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1128: Array[Int]
+       private fun action_table_row1128: Array[Int]

        do
                return [
                                -1, 1, 209 ,
                                58, 0, 1215 
                        ]
        end
        do
                return [
                                -1, 1, 209 ,
                                58, 0, 1215 
                        ]
        end

-       private meth action_table_row1129: Array[Int]
+       private fun action_table_row1129: Array[Int]

        do
                return [
                                -1, 3, 1128 ,
        do
                return [
                                -1, 3, 1128 ,

@@ -13465,21 +13465,21 @@ abstract class ParserTable
                                19, 0, 1217 
                        ]
        end
                                19, 0, 1217 
                        ]
        end

-       private meth action_table_row1130: Array[Int]
+       private fun action_table_row1130: Array[Int]

        do
                return [
                                -1, 3, 1129 ,
                                78, 0, 1218 
                        ]
        end
        do
                return [
                                -1, 3, 1129 ,
                                78, 0, 1218 
                        ]
        end

-       private meth action_table_row1131: Array[Int]
+       private fun action_table_row1131: Array[Int]

        do
                return [
                                -1, 3, 1130 ,
                                78, 0, 1219 
                        ]
        end
        do
                return [
                                -1, 3, 1130 ,
                                78, 0, 1219 
                        ]
        end

-       private meth action_table_row1132: Array[Int]
+       private fun action_table_row1132: Array[Int]

        do
                return [
                                -1, 1, 113 ,
        do
                return [
                                -1, 1, 113 ,

@@ -13487,7 +13487,7 @@ abstract class ParserTable
                                58, 0, 1220 
                        ]
        end
                                58, 0, 1220 
                        ]
        end

-       private meth action_table_row1133: Array[Int]
+       private fun action_table_row1133: Array[Int]

        do
                return [
                                -1, 1, 185 ,
        do
                return [
                                -1, 1, 185 ,

@@ -13495,21 +13495,21 @@ abstract class ParserTable
                                58, 0, 1222 
                        ]
        end
                                58, 0, 1222 
                        ]
        end

-       private meth action_table_row1134: Array[Int]
+       private fun action_table_row1134: Array[Int]

        do
                return [
                                -1, 3, 1133 ,
                                78, 0, 1224 
                        ]
        end
        do
                return [
                                -1, 3, 1133 ,
                                78, 0, 1224 
                        ]
        end

-       private meth action_table_row1135: Array[Int]
+       private fun action_table_row1135: Array[Int]

        do
                return [
                                -1, 3, 1134 ,
                                78, 0, 1225 
                        ]
        end
        do
                return [
                                -1, 3, 1134 ,
                                78, 0, 1225 
                        ]
        end

-       private meth action_table_row1136: Array[Int]
+       private fun action_table_row1136: Array[Int]

        do
                return [
                                -1, 1, 102 ,
        do
                return [
                                -1, 1, 102 ,

@@ -13517,7 +13517,7 @@ abstract class ParserTable
                                58, 0, 1226 
                        ]
        end
                                58, 0, 1226 
                        ]
        end

-       private meth action_table_row1137: Array[Int]
+       private fun action_table_row1137: Array[Int]

        do
                return [
                                -1, 1, 174 ,
        do
                return [
                                -1, 1, 174 ,

@@ -13525,7 +13525,7 @@ abstract class ParserTable
                                58, 0, 1228 
                        ]
        end
                                58, 0, 1228 
                        ]
        end

-       private meth action_table_row1138: Array[Int]
+       private fun action_table_row1138: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13533,14 +13533,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1139: Array[Int]
+       private fun action_table_row1139: Array[Int]

        do
                return [
                                -1, 1, 122 ,
                                58, 0, 1231 
                        ]
        end
        do
                return [
                                -1, 1, 122 ,
                                58, 0, 1231 
                        ]
        end

-       private meth action_table_row1140: Array[Int]
+       private fun action_table_row1140: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13548,14 +13548,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1141: Array[Int]
+       private fun action_table_row1141: Array[Int]

        do
                return [
                                -1, 1, 194 ,
                                58, 0, 1233 
                        ]
        end
        do
                return [
                                -1, 1, 194 ,
                                58, 0, 1233 
                        ]
        end

-       private meth action_table_row1142: Array[Int]
+       private fun action_table_row1142: Array[Int]

        do
                return [
                                -1, 1, 117 ,
        do
                return [
                                -1, 1, 117 ,

@@ -13563,7 +13563,7 @@ abstract class ParserTable
                                58, 0, 1234 
                        ]
        end
                                58, 0, 1234 
                        ]
        end

-       private meth action_table_row1143: Array[Int]
+       private fun action_table_row1143: Array[Int]

        do
                return [
                                -1, 1, 189 ,
        do
                return [
                                -1, 1, 189 ,

@@ -13571,7 +13571,7 @@ abstract class ParserTable
                                58, 0, 1236 
                        ]
        end
                                58, 0, 1236 
                        ]
        end

-       private meth action_table_row1144: Array[Int]
+       private fun action_table_row1144: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13579,14 +13579,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1145: Array[Int]
+       private fun action_table_row1145: Array[Int]

        do
                return [
                                -1, 1, 126 ,
                                58, 0, 1239 
                        ]
        end
        do
                return [
                                -1, 1, 126 ,
                                58, 0, 1239 
                        ]
        end

-       private meth action_table_row1146: Array[Int]
+       private fun action_table_row1146: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13594,14 +13594,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1147: Array[Int]
+       private fun action_table_row1147: Array[Int]

        do
                return [
                                -1, 1, 198 ,
                                58, 0, 1241 
                        ]
        end
        do
                return [
                                -1, 1, 198 ,
                                58, 0, 1241 
                        ]
        end

-       private meth action_table_row1148: Array[Int]
+       private fun action_table_row1148: Array[Int]

        do
                return [
                                -1, 3, 1147 ,
        do
                return [
                                -1, 3, 1147 ,

@@ -13610,7 +13610,7 @@ abstract class ParserTable
                                21, 0, 1244 
                        ]
        end
                                21, 0, 1244 
                        ]
        end

-       private meth action_table_row1149: Array[Int]
+       private fun action_table_row1149: Array[Int]

        do
                return [
                                -1, 3, 1148 ,
        do
                return [
                                -1, 3, 1148 ,

@@ -13646,7 +13646,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1150: Array[Int]
+       private fun action_table_row1150: Array[Int]

        do
                return [
                                -1, 3, 1149 ,
        do
                return [
                                -1, 3, 1149 ,

@@ -13674,7 +13674,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1151: Array[Int]
+       private fun action_table_row1151: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13682,7 +13682,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1152: Array[Int]
+       private fun action_table_row1152: Array[Int]

        do
                return [
                                -1, 3, 1151 ,
        do
                return [
                                -1, 3, 1151 ,

@@ -13718,14 +13718,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1153: Array[Int]
+       private fun action_table_row1153: Array[Int]

        do
                return [
                                -1, 1, 246 ,
                                9, 0, 1249 
                        ]
        end
        do
                return [
                                -1, 1, 246 ,
                                9, 0, 1249 
                        ]
        end

-       private meth action_table_row1154: Array[Int]
+       private fun action_table_row1154: Array[Int]

        do
                return [
                                -1, 3, 1153 ,
        do
                return [
                                -1, 3, 1153 ,

@@ -13753,7 +13753,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1155: Array[Int]
+       private fun action_table_row1155: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13761,13 +13761,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1156: Array[Int]
+       private fun action_table_row1156: Array[Int]

        do
                return [
                                -1, 1, 72 
                        ]
        end
        do
                return [
                                -1, 1, 72 
                        ]
        end

-       private meth action_table_row1157: Array[Int]
+       private fun action_table_row1157: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13775,13 +13775,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1158: Array[Int]
+       private fun action_table_row1158: Array[Int]

        do
                return [
                                -1, 1, 434 
                        ]
        end
        do
                return [
                                -1, 1, 434 
                        ]
        end

-       private meth action_table_row1159: Array[Int]
+       private fun action_table_row1159: Array[Int]

        do
                return [
                                -1, 3, 1158 ,
        do
                return [
                                -1, 3, 1158 ,

@@ -13807,7 +13807,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1160: Array[Int]
+       private fun action_table_row1160: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -13815,25 +13815,25 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1161: Array[Int]
+       private fun action_table_row1161: Array[Int]

        do
                return [
                                -1, 1, 648 
                        ]
        end
        do
                return [
                                -1, 1, 648 
                        ]
        end

-       private meth action_table_row1162: Array[Int]
+       private fun action_table_row1162: Array[Int]

        do
                return [
                                -1, 1, 70 
                        ]
        end
        do
                return [
                                -1, 1, 70 
                        ]
        end

-       private meth action_table_row1163: Array[Int]
+       private fun action_table_row1163: Array[Int]

        do
                return [
                                -1, 1, 77 
                        ]
        end
        do
                return [
                                -1, 1, 77 
                        ]
        end

-       private meth action_table_row1164: Array[Int]
+       private fun action_table_row1164: Array[Int]

        do
                return [
                                -1, 1, 256 ,
        do
                return [
                                -1, 1, 256 ,

@@ -13846,39 +13846,39 @@ abstract class ParserTable
                                24, 0, 29 
                        ]
        end
                                24, 0, 29 
                        ]
        end

-       private meth action_table_row1165: Array[Int]
+       private fun action_table_row1165: Array[Int]

        do
                return [
                                -1, 1, 74 
                        ]
        end
        do
                return [
                                -1, 1, 74 
                        ]
        end

-       private meth action_table_row1166: Array[Int]
+       private fun action_table_row1166: Array[Int]

        do
                return [
                                -1, 1, 310 ,
                                27, 1, 540 
                        ]
        end
        do
                return [
                                -1, 1, 310 ,
                                27, 1, 540 
                        ]
        end

-       private meth action_table_row1167: Array[Int]
+       private fun action_table_row1167: Array[Int]

        do
                return [
                                -1, 1, 572 
                        ]
        end
        do
                return [
                                -1, 1, 572 
                        ]
        end

-       private meth action_table_row1168: Array[Int]
+       private fun action_table_row1168: Array[Int]

        do
                return [
                                -1, 3, 1167 ,
                                27, 0, 1256 
                        ]
        end
        do
                return [
                                -1, 3, 1167 ,
                                27, 0, 1256 
                        ]
        end

-       private meth action_table_row1169: Array[Int]
+       private fun action_table_row1169: Array[Int]

        do
                return [
                                -1, 1, 585 
                        ]
        end
        do
                return [
                                -1, 1, 585 
                        ]
        end

-       private meth action_table_row1170: Array[Int]
+       private fun action_table_row1170: Array[Int]

        do
                return [
                                -1, 3, 1169 ,
        do
                return [
                                -1, 3, 1169 ,

@@ -13906,14 +13906,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1171: Array[Int]
+       private fun action_table_row1171: Array[Int]

        do
                return [
                                -1, 1, 413 ,
                                48, 0, 814 
                        ]
        end
        do
                return [
                                -1, 1, 413 ,
                                48, 0, 814 
                        ]
        end

-       private meth action_table_row1172: Array[Int]
+       private fun action_table_row1172: Array[Int]

        do
                return [
                                -1, 3, 1171 ,
        do
                return [
                                -1, 3, 1171 ,

@@ -13921,7 +13921,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1173: Array[Int]
+       private fun action_table_row1173: Array[Int]

        do
                return [
                                -1, 1, 345 ,
        do
                return [
                                -1, 1, 345 ,

@@ -13955,13 +13955,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1174: Array[Int]
+       private fun action_table_row1174: Array[Int]

        do
                return [
                                -1, 1, 568 
                        ]
        end
        do
                return [
                                -1, 1, 568 
                        ]
        end

-       private meth action_table_row1175: Array[Int]
+       private fun action_table_row1175: Array[Int]

        do
                return [
                                -1, 3, 1174 ,
        do
                return [
                                -1, 3, 1174 ,

@@ -13989,7 +13989,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1176: Array[Int]
+       private fun action_table_row1176: Array[Int]

        do
                return [
                                -1, 3, 1175 ,
        do
                return [
                                -1, 3, 1175 ,

@@ -14017,25 +14017,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1177: Array[Int]
+       private fun action_table_row1177: Array[Int]

        do
                return [
                                -1, 1, 559 
                        ]
        end
        do
                return [
                                -1, 1, 559 
                        ]
        end

-       private meth action_table_row1178: Array[Int]
+       private fun action_table_row1178: Array[Int]

        do
                return [
                                -1, 1, 573 
                        ]
        end
        do
                return [
                                -1, 1, 573 
                        ]
        end

-       private meth action_table_row1179: Array[Int]
+       private fun action_table_row1179: Array[Int]

        do
                return [
                                -1, 1, 578 
                        ]
        end
        do
                return [
                                -1, 1, 578 
                        ]
        end

-       private meth action_table_row1180: Array[Int]
+       private fun action_table_row1180: Array[Int]

        do
                return [
                                -1, 3, 1179 ,
        do
                return [
                                -1, 3, 1179 ,

@@ -14063,7 +14063,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1181: Array[Int]
+       private fun action_table_row1181: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14071,40 +14071,40 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1182: Array[Int]
+       private fun action_table_row1182: Array[Int]

        do
                return [
                                -1, 3, 1181 ,
                                77, 0, 1266 
                        ]
        end
        do
                return [
                                -1, 3, 1181 ,
                                77, 0, 1266 
                        ]
        end

-       private meth action_table_row1183: Array[Int]
+       private fun action_table_row1183: Array[Int]

        do
                return [
                                -1, 1, 515 ,
                                63, 1, 517 
                        ]
        end
        do
                return [
                                -1, 1, 515 ,
                                63, 1, 517 
                        ]
        end

-       private meth action_table_row1184: Array[Int]
+       private fun action_table_row1184: Array[Int]

        do
                return [
                                -1, 1, 523 
                        ]
        end
        do
                return [
                                -1, 1, 523 
                        ]
        end

-       private meth action_table_row1185: Array[Int]
+       private fun action_table_row1185: Array[Int]

        do
                return [
                                -1, 3, 1184 ,
                                51, 0, 1267 
                        ]
        end
        do
                return [
                                -1, 3, 1184 ,
                                51, 0, 1267 
                        ]
        end

-       private meth action_table_row1186: Array[Int]
+       private fun action_table_row1186: Array[Int]

        do
                return [
                                -1, 1, 519 
                        ]
        end
        do
                return [
                                -1, 1, 519 
                        ]
        end

-       private meth action_table_row1187: Array[Int]
+       private fun action_table_row1187: Array[Int]

        do
                return [
                                -1, 3, 1186 ,
        do
                return [
                                -1, 3, 1186 ,

@@ -14112,19 +14112,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1188: Array[Int]
+       private fun action_table_row1188: Array[Int]

        do
                return [
                                -1, 1, 298 
                        ]
        end
        do
                return [
                                -1, 1, 298 
                        ]
        end

-       private meth action_table_row1189: Array[Int]
+       private fun action_table_row1189: Array[Int]

        do
                return [
                                -1, 1, 76 
                        ]
        end
        do
                return [
                                -1, 1, 76 
                        ]
        end

-       private meth action_table_row1190: Array[Int]
+       private fun action_table_row1190: Array[Int]

        do
                return [
                                -1, 3, 1189 ,
        do
                return [
                                -1, 3, 1189 ,

@@ -14132,21 +14132,21 @@ abstract class ParserTable
                                19, 0, 1270 
                        ]
        end
                                19, 0, 1270 
                        ]
        end

-       private meth action_table_row1191: Array[Int]
+       private fun action_table_row1191: Array[Int]

        do
                return [
                                -1, 3, 1190 ,
                                78, 0, 1271 
                        ]
        end
        do
                return [
                                -1, 3, 1190 ,
                                78, 0, 1271 
                        ]
        end

-       private meth action_table_row1192: Array[Int]
+       private fun action_table_row1192: Array[Int]

        do
                return [
                                -1, 3, 1191 ,
                                78, 0, 1272 
                        ]
        end
        do
                return [
                                -1, 3, 1191 ,
                                78, 0, 1272 
                        ]
        end

-       private meth action_table_row1193: Array[Int]
+       private fun action_table_row1193: Array[Int]

        do
                return [
                                -1, 1, 116 ,
        do
                return [
                                -1, 1, 116 ,

@@ -14154,7 +14154,7 @@ abstract class ParserTable
                                58, 0, 1273 
                        ]
        end
                                58, 0, 1273 
                        ]
        end

-       private meth action_table_row1194: Array[Int]
+       private fun action_table_row1194: Array[Int]

        do
                return [
                                -1, 1, 188 ,
        do
                return [
                                -1, 1, 188 ,

@@ -14162,21 +14162,21 @@ abstract class ParserTable
                                58, 0, 1275 
                        ]
        end
                                58, 0, 1275 
                        ]
        end

-       private meth action_table_row1195: Array[Int]
+       private fun action_table_row1195: Array[Int]

        do
                return [
                                -1, 3, 1194 ,
                                78, 0, 1277 
                        ]
        end
        do
                return [
                                -1, 3, 1194 ,
                                78, 0, 1277 
                        ]
        end

-       private meth action_table_row1196: Array[Int]
+       private fun action_table_row1196: Array[Int]

        do
                return [
                                -1, 3, 1195 ,
                                78, 0, 1278 
                        ]
        end
        do
                return [
                                -1, 3, 1195 ,
                                78, 0, 1278 
                        ]
        end

-       private meth action_table_row1197: Array[Int]
+       private fun action_table_row1197: Array[Int]

        do
                return [
                                -1, 1, 105 ,
        do
                return [
                                -1, 1, 105 ,

@@ -14184,7 +14184,7 @@ abstract class ParserTable
                                58, 0, 1279 
                        ]
        end
                                58, 0, 1279 
                        ]
        end

-       private meth action_table_row1198: Array[Int]
+       private fun action_table_row1198: Array[Int]

        do
                return [
                                -1, 1, 177 ,
        do
                return [
                                -1, 1, 177 ,

@@ -14192,7 +14192,7 @@ abstract class ParserTable
                                58, 0, 1281 
                        ]
        end
                                58, 0, 1281 
                        ]
        end

-       private meth action_table_row1199: Array[Int]
+       private fun action_table_row1199: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14200,14 +14200,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1200: Array[Int]
+       private fun action_table_row1200: Array[Int]

        do
                return [
                                -1, 1, 125 ,
                                58, 0, 1284 
                        ]
        end
        do
                return [
                                -1, 1, 125 ,
                                58, 0, 1284 
                        ]
        end

-       private meth action_table_row1201: Array[Int]
+       private fun action_table_row1201: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14215,14 +14215,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1202: Array[Int]
+       private fun action_table_row1202: Array[Int]

        do
                return [
                                -1, 1, 197 ,
                                58, 0, 1286 
                        ]
        end
        do
                return [
                                -1, 1, 197 ,
                                58, 0, 1286 
                        ]
        end

-       private meth action_table_row1203: Array[Int]
+       private fun action_table_row1203: Array[Int]

        do
                return [
                                -1, 1, 118 ,
        do
                return [
                                -1, 1, 118 ,

@@ -14230,7 +14230,7 @@ abstract class ParserTable
                                58, 0, 1287 
                        ]
        end
                                58, 0, 1287 
                        ]
        end

-       private meth action_table_row1204: Array[Int]
+       private fun action_table_row1204: Array[Int]

        do
                return [
                                -1, 1, 190 ,
        do
                return [
                                -1, 1, 190 ,

@@ -14238,7 +14238,7 @@ abstract class ParserTable
                                58, 0, 1289 
                        ]
        end
                                58, 0, 1289 
                        ]
        end

-       private meth action_table_row1205: Array[Int]
+       private fun action_table_row1205: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14246,14 +14246,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1206: Array[Int]
+       private fun action_table_row1206: Array[Int]

        do
                return [
                                -1, 1, 127 ,
                                58, 0, 1292 
                        ]
        end
        do
                return [
                                -1, 1, 127 ,
                                58, 0, 1292 
                        ]
        end

-       private meth action_table_row1207: Array[Int]
+       private fun action_table_row1207: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14261,14 +14261,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1208: Array[Int]
+       private fun action_table_row1208: Array[Int]

        do
                return [
                                -1, 1, 199 ,
                                58, 0, 1294 
                        ]
        end
        do
                return [
                                -1, 1, 199 ,
                                58, 0, 1294 
                        ]
        end

-       private meth action_table_row1209: Array[Int]
+       private fun action_table_row1209: Array[Int]

        do
                return [
                                -1, 3, 1208 ,
        do
                return [
                                -1, 3, 1208 ,

@@ -14277,7 +14277,7 @@ abstract class ParserTable
                                21, 0, 1297 
                        ]
        end
                                21, 0, 1297 
                        ]
        end

-       private meth action_table_row1210: Array[Int]
+       private fun action_table_row1210: Array[Int]

        do
                return [
                                -1, 3, 1209 ,
        do
                return [
                                -1, 3, 1209 ,

@@ -14313,7 +14313,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1211: Array[Int]
+       private fun action_table_row1211: Array[Int]

        do
                return [
                                -1, 3, 1210 ,
        do
                return [
                                -1, 3, 1210 ,

@@ -14341,7 +14341,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1212: Array[Int]
+       private fun action_table_row1212: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14349,7 +14349,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1213: Array[Int]
+       private fun action_table_row1213: Array[Int]

        do
                return [
                                -1, 3, 1212 ,
        do
                return [
                                -1, 3, 1212 ,

@@ -14385,14 +14385,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1214: Array[Int]
+       private fun action_table_row1214: Array[Int]

        do
                return [
                                -1, 1, 247 ,
                                9, 0, 1302 
                        ]
        end
        do
                return [
                                -1, 1, 247 ,
                                9, 0, 1302 
                        ]
        end

-       private meth action_table_row1215: Array[Int]
+       private fun action_table_row1215: Array[Int]

        do
                return [
                                -1, 3, 1214 ,
        do
                return [
                                -1, 3, 1214 ,

@@ -14420,7 +14420,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1216: Array[Int]
+       private fun action_table_row1216: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14428,21 +14428,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1217: Array[Int]
+       private fun action_table_row1217: Array[Int]

        do
                return [
                                -1, 3, 1216 ,
                                78, 0, 1305 
                        ]
        end
        do
                return [
                                -1, 3, 1216 ,
                                78, 0, 1305 
                        ]
        end

-       private meth action_table_row1218: Array[Int]
+       private fun action_table_row1218: Array[Int]

        do
                return [
                                -1, 3, 1217 ,
                                78, 0, 1306 
                        ]
        end
        do
                return [
                                -1, 3, 1217 ,
                                78, 0, 1306 
                        ]
        end

-       private meth action_table_row1219: Array[Int]
+       private fun action_table_row1219: Array[Int]

        do
                return [
                                -1, 1, 103 ,
        do
                return [
                                -1, 1, 103 ,

@@ -14450,7 +14450,7 @@ abstract class ParserTable
                                58, 0, 1307 
                        ]
        end
                                58, 0, 1307 
                        ]
        end

-       private meth action_table_row1220: Array[Int]
+       private fun action_table_row1220: Array[Int]

        do
                return [
                                -1, 1, 175 ,
        do
                return [
                                -1, 1, 175 ,

@@ -14458,7 +14458,7 @@ abstract class ParserTable
                                58, 0, 1309 
                        ]
        end
                                58, 0, 1309 
                        ]
        end

-       private meth action_table_row1221: Array[Int]
+       private fun action_table_row1221: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14466,14 +14466,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1222: Array[Int]
+       private fun action_table_row1222: Array[Int]

        do
                return [
                                -1, 1, 131 ,
                                58, 0, 1312 
                        ]
        end
        do
                return [
                                -1, 1, 131 ,
                                58, 0, 1312 
                        ]
        end

-       private meth action_table_row1223: Array[Int]
+       private fun action_table_row1223: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14481,14 +14481,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1224: Array[Int]
+       private fun action_table_row1224: Array[Int]

        do
                return [
                                -1, 1, 203 ,
                                58, 0, 1314 
                        ]
        end
        do
                return [
                                -1, 1, 203 ,
                                58, 0, 1314 
                        ]
        end

-       private meth action_table_row1225: Array[Int]
+       private fun action_table_row1225: Array[Int]

        do
                return [
                                -1, 1, 111 ,
        do
                return [
                                -1, 1, 111 ,

@@ -14496,7 +14496,7 @@ abstract class ParserTable
                                58, 0, 1315 
                        ]
        end
                                58, 0, 1315 
                        ]
        end

-       private meth action_table_row1226: Array[Int]
+       private fun action_table_row1226: Array[Int]

        do
                return [
                                -1, 1, 183 ,
        do
                return [
                                -1, 1, 183 ,

@@ -14504,7 +14504,7 @@ abstract class ParserTable
                                58, 0, 1317 
                        ]
        end
                                58, 0, 1317 
                        ]
        end

-       private meth action_table_row1227: Array[Int]
+       private fun action_table_row1227: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14512,14 +14512,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1228: Array[Int]
+       private fun action_table_row1228: Array[Int]

        do
                return [
                                -1, 1, 120 ,
                                58, 0, 1320 
                        ]
        end
        do
                return [
                                -1, 1, 120 ,
                                58, 0, 1320 
                        ]
        end

-       private meth action_table_row1229: Array[Int]
+       private fun action_table_row1229: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14527,14 +14527,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1230: Array[Int]
+       private fun action_table_row1230: Array[Int]

        do
                return [
                                -1, 1, 192 ,
                                58, 0, 1322 
                        ]
        end
        do
                return [
                                -1, 1, 192 ,
                                58, 0, 1322 
                        ]
        end

-       private meth action_table_row1231: Array[Int]
+       private fun action_table_row1231: Array[Int]

        do
                return [
                                -1, 3, 1230 ,
        do
                return [
                                -1, 3, 1230 ,

@@ -14562,7 +14562,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1232: Array[Int]
+       private fun action_table_row1232: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14570,7 +14570,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1233: Array[Int]
+       private fun action_table_row1233: Array[Int]

        do
                return [
                                -1, 3, 1232 ,
        do
                return [
                                -1, 3, 1232 ,

@@ -14598,7 +14598,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1234: Array[Int]
+       private fun action_table_row1234: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14606,7 +14606,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1235: Array[Int]
+       private fun action_table_row1235: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14614,14 +14614,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1236: Array[Int]
+       private fun action_table_row1236: Array[Int]

        do
                return [
                                -1, 1, 135 ,
                                58, 0, 1328 
                        ]
        end
        do
                return [
                                -1, 1, 135 ,
                                58, 0, 1328 
                        ]
        end

-       private meth action_table_row1237: Array[Int]
+       private fun action_table_row1237: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14629,14 +14629,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1238: Array[Int]
+       private fun action_table_row1238: Array[Int]

        do
                return [
                                -1, 1, 207 ,
                                58, 0, 1330 
                        ]
        end
        do
                return [
                                -1, 1, 207 ,
                                58, 0, 1330 
                        ]
        end

-       private meth action_table_row1239: Array[Int]
+       private fun action_table_row1239: Array[Int]

        do
                return [
                                -1, 3, 1238 ,
        do
                return [
                                -1, 3, 1238 ,

@@ -14664,7 +14664,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1240: Array[Int]
+       private fun action_table_row1240: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14672,7 +14672,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1241: Array[Int]
+       private fun action_table_row1241: Array[Int]

        do
                return [
                                -1, 3, 1240 ,
        do
                return [
                                -1, 3, 1240 ,

@@ -14700,7 +14700,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1242: Array[Int]
+       private fun action_table_row1242: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14708,39 +14708,39 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1243: Array[Int]
+       private fun action_table_row1243: Array[Int]

        do
                return [
                                -1, 1, 94 
                        ]
        end
        do
                return [
                                -1, 1, 94 
                        ]
        end

-       private meth action_table_row1244: Array[Int]
+       private fun action_table_row1244: Array[Int]

        do
                return [
                                -1, 1, 96 
                        ]
        end
        do
                return [
                                -1, 1, 96 
                        ]
        end

-       private meth action_table_row1245: Array[Int]
+       private fun action_table_row1245: Array[Int]

        do
                return [
                                -1, 1, 98 ,
                                82, 0, 1335 
                        ]
        end
        do
                return [
                                -1, 1, 98 ,
                                82, 0, 1335 
                        ]
        end

-       private meth action_table_row1246: Array[Int]
+       private fun action_table_row1246: Array[Int]

        do
                return [
                                -1, 1, 90 ,
                                9, 0, 1336 
                        ]
        end
        do
                return [
                                -1, 1, 90 ,
                                9, 0, 1336 
                        ]
        end

-       private meth action_table_row1247: Array[Int]
+       private fun action_table_row1247: Array[Int]

        do
                return [
                                -1, 1, 146 
                        ]
        end
        do
                return [
                                -1, 1, 146 
                        ]
        end

-       private meth action_table_row1248: Array[Int]
+       private fun action_table_row1248: Array[Int]

        do
                return [
                                -1, 3, 1247 ,
        do
                return [
                                -1, 3, 1247 ,

@@ -14768,26 +14768,26 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1249: Array[Int]
+       private fun action_table_row1249: Array[Int]

        do
                return [
                                -1, 1, 248 ,
                                9, 0, 1338 
                        ]
        end
        do
                return [
                                -1, 1, 248 ,
                                9, 0, 1338 
                        ]
        end

-       private meth action_table_row1250: Array[Int]
+       private fun action_table_row1250: Array[Int]

        do
                return [
                                -1, 1, 250 
                        ]
        end
        do
                return [
                                -1, 1, 250 
                        ]
        end

-       private meth action_table_row1251: Array[Int]
+       private fun action_table_row1251: Array[Int]

        do
                return [
                                -1, 1, 218 
                        ]
        end
        do
                return [
                                -1, 1, 218 
                        ]
        end

-       private meth action_table_row1252: Array[Int]
+       private fun action_table_row1252: Array[Int]

        do
                return [
                                -1, 3, 1251 ,
        do
                return [
                                -1, 3, 1251 ,

@@ -14815,33 +14815,33 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1253: Array[Int]
+       private fun action_table_row1253: Array[Int]

        do
                return [
                                -1, 3, 1252 ,
                                52, 0, 1340 
                        ]
        end
        do
                return [
                                -1, 3, 1252 ,
                                52, 0, 1340 
                        ]
        end

-       private meth action_table_row1254: Array[Int]
+       private fun action_table_row1254: Array[Int]

        do
                return [
                                -1, 1, 600 
                        ]
        end
        do
                return [
                                -1, 1, 600 
                        ]
        end

-       private meth action_table_row1255: Array[Int]
+       private fun action_table_row1255: Array[Int]

        do
                return [
                                -1, 3, 1254 ,
                                52, 0, 1341 
                        ]
        end
        do
                return [
                                -1, 3, 1254 ,
                                52, 0, 1341 
                        ]
        end

-       private meth action_table_row1256: Array[Int]
+       private fun action_table_row1256: Array[Int]

        do
                return [
                                -1, 1, 78 
                        ]
        end
        do
                return [
                                -1, 1, 78 
                        ]
        end

-       private meth action_table_row1257: Array[Int]
+       private fun action_table_row1257: Array[Int]

        do
                return [
                                -1, 3, 1256 ,
        do
                return [
                                -1, 3, 1256 ,

@@ -14877,7 +14877,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1258: Array[Int]
+       private fun action_table_row1258: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -14885,13 +14885,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1259: Array[Int]
+       private fun action_table_row1259: Array[Int]

        do
                return [
                                -1, 1, 590 
                        ]
        end
        do
                return [
                                -1, 1, 590 
                        ]
        end

-       private meth action_table_row1260: Array[Int]
+       private fun action_table_row1260: Array[Int]

        do
                return [
                                -1, 1, 340 ,
        do
                return [
                                -1, 1, 340 ,

@@ -14925,7 +14925,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1261: Array[Int]
+       private fun action_table_row1261: Array[Int]

        do
                return [
                                -1, 3, 1260 ,
        do
                return [
                                -1, 3, 1260 ,

@@ -14933,7 +14933,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1262: Array[Int]
+       private fun action_table_row1262: Array[Int]

        do
                return [
                                -1, 3, 1261 ,
        do
                return [
                                -1, 3, 1261 ,

@@ -14941,25 +14941,25 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1263: Array[Int]
+       private fun action_table_row1263: Array[Int]

        do
                return [
                                -1, 1, 575 
                        ]
        end
        do
                return [
                                -1, 1, 575 
                        ]
        end

-       private meth action_table_row1264: Array[Int]
+       private fun action_table_row1264: Array[Int]

        do
                return [
                                -1, 1, 580 
                        ]
        end
        do
                return [
                                -1, 1, 580 
                        ]
        end

-       private meth action_table_row1265: Array[Int]
+       private fun action_table_row1265: Array[Int]

        do
                return [
                                -1, 1, 381 
                        ]
        end
        do
                return [
                                -1, 1, 381 
                        ]
        end

-       private meth action_table_row1266: Array[Int]
+       private fun action_table_row1266: Array[Int]

        do
                return [
                                -1, 3, 1265 ,
        do
                return [
                                -1, 3, 1265 ,

@@ -14987,14 +14987,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1267: Array[Int]
+       private fun action_table_row1267: Array[Int]

        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end
        do
                return [
                                -1, 1, 446 ,
                                51, 0, 223 
                        ]
        end

-       private meth action_table_row1268: Array[Int]
+       private fun action_table_row1268: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15002,27 +15002,27 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1269: Array[Int]
+       private fun action_table_row1269: Array[Int]

        do
                return [
                                -1, 1, 299 
                        ]
        end
        do
                return [
                                -1, 1, 299 
                        ]
        end

-       private meth action_table_row1270: Array[Int]
+       private fun action_table_row1270: Array[Int]

        do
                return [
                                -1, 3, 1269 ,
                                78, 0, 1350 
                        ]
        end
        do
                return [
                                -1, 3, 1269 ,
                                78, 0, 1350 
                        ]
        end

-       private meth action_table_row1271: Array[Int]
+       private fun action_table_row1271: Array[Int]

        do
                return [
                                -1, 3, 1270 ,
                                78, 0, 1351 
                        ]
        end
        do
                return [
                                -1, 3, 1270 ,
                                78, 0, 1351 
                        ]
        end

-       private meth action_table_row1272: Array[Int]
+       private fun action_table_row1272: Array[Int]

        do
                return [
                                -1, 1, 106 ,
        do
                return [
                                -1, 1, 106 ,

@@ -15030,7 +15030,7 @@ abstract class ParserTable
                                58, 0, 1352 
                        ]
        end
                                58, 0, 1352 
                        ]
        end

-       private meth action_table_row1273: Array[Int]
+       private fun action_table_row1273: Array[Int]

        do
                return [
                                -1, 1, 178 ,
        do
                return [
                                -1, 1, 178 ,

@@ -15038,7 +15038,7 @@ abstract class ParserTable
                                58, 0, 1354 
                        ]
        end
                                58, 0, 1354 
                        ]
        end

-       private meth action_table_row1274: Array[Int]
+       private fun action_table_row1274: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15046,14 +15046,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1275: Array[Int]
+       private fun action_table_row1275: Array[Int]

        do
                return [
                                -1, 1, 134 ,
                                58, 0, 1357 
                        ]
        end
        do
                return [
                                -1, 1, 134 ,
                                58, 0, 1357 
                        ]
        end

-       private meth action_table_row1276: Array[Int]
+       private fun action_table_row1276: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15061,14 +15061,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1277: Array[Int]
+       private fun action_table_row1277: Array[Int]

        do
                return [
                                -1, 1, 206 ,
                                58, 0, 1359 
                        ]
        end
        do
                return [
                                -1, 1, 206 ,
                                58, 0, 1359 
                        ]
        end

-       private meth action_table_row1278: Array[Int]
+       private fun action_table_row1278: Array[Int]

        do
                return [
                                -1, 1, 114 ,
        do
                return [
                                -1, 1, 114 ,

@@ -15076,7 +15076,7 @@ abstract class ParserTable
                                58, 0, 1360 
                        ]
        end
                                58, 0, 1360 
                        ]
        end

-       private meth action_table_row1279: Array[Int]
+       private fun action_table_row1279: Array[Int]

        do
                return [
                                -1, 1, 186 ,
        do
                return [
                                -1, 1, 186 ,

@@ -15084,7 +15084,7 @@ abstract class ParserTable
                                58, 0, 1362 
                        ]
        end
                                58, 0, 1362 
                        ]
        end

-       private meth action_table_row1280: Array[Int]
+       private fun action_table_row1280: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15092,14 +15092,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1281: Array[Int]
+       private fun action_table_row1281: Array[Int]

        do
                return [
                                -1, 1, 123 ,
                                58, 0, 1365 
                        ]
        end
        do
                return [
                                -1, 1, 123 ,
                                58, 0, 1365 
                        ]
        end

-       private meth action_table_row1282: Array[Int]
+       private fun action_table_row1282: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15107,14 +15107,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1283: Array[Int]
+       private fun action_table_row1283: Array[Int]

        do
                return [
                                -1, 1, 195 ,
                                58, 0, 1367 
                        ]
        end
        do
                return [
                                -1, 1, 195 ,
                                58, 0, 1367 
                        ]
        end

-       private meth action_table_row1284: Array[Int]
+       private fun action_table_row1284: Array[Int]

        do
                return [
                                -1, 3, 1283 ,
        do
                return [
                                -1, 3, 1283 ,

@@ -15142,7 +15142,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1285: Array[Int]
+       private fun action_table_row1285: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15150,7 +15150,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1286: Array[Int]
+       private fun action_table_row1286: Array[Int]

        do
                return [
                                -1, 3, 1285 ,
        do
                return [
                                -1, 3, 1285 ,

@@ -15178,7 +15178,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1287: Array[Int]
+       private fun action_table_row1287: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15186,7 +15186,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1288: Array[Int]
+       private fun action_table_row1288: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15194,14 +15194,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1289: Array[Int]
+       private fun action_table_row1289: Array[Int]

        do
                return [
                                -1, 1, 136 ,
                                58, 0, 1373 
                        ]
        end
        do
                return [
                                -1, 1, 136 ,
                                58, 0, 1373 
                        ]
        end

-       private meth action_table_row1290: Array[Int]
+       private fun action_table_row1290: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15209,14 +15209,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1291: Array[Int]
+       private fun action_table_row1291: Array[Int]

        do
                return [
                                -1, 1, 208 ,
                                58, 0, 1375 
                        ]
        end
        do
                return [
                                -1, 1, 208 ,
                                58, 0, 1375 
                        ]
        end

-       private meth action_table_row1292: Array[Int]
+       private fun action_table_row1292: Array[Int]

        do
                return [
                                -1, 3, 1291 ,
        do
                return [
                                -1, 3, 1291 ,

@@ -15244,7 +15244,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1293: Array[Int]
+       private fun action_table_row1293: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15252,7 +15252,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1294: Array[Int]
+       private fun action_table_row1294: Array[Int]

        do
                return [
                                -1, 3, 1293 ,
        do
                return [
                                -1, 3, 1293 ,

@@ -15280,7 +15280,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1295: Array[Int]
+       private fun action_table_row1295: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15288,39 +15288,39 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1296: Array[Int]
+       private fun action_table_row1296: Array[Int]

        do
                return [
                                -1, 1, 95 
                        ]
        end
        do
                return [
                                -1, 1, 95 
                        ]
        end

-       private meth action_table_row1297: Array[Int]
+       private fun action_table_row1297: Array[Int]

        do
                return [
                                -1, 1, 97 
                        ]
        end
        do
                return [
                                -1, 1, 97 
                        ]
        end

-       private meth action_table_row1298: Array[Int]
+       private fun action_table_row1298: Array[Int]

        do
                return [
                                -1, 1, 99 ,
                                82, 0, 1380 
                        ]
        end
        do
                return [
                                -1, 1, 99 ,
                                82, 0, 1380 
                        ]
        end

-       private meth action_table_row1299: Array[Int]
+       private fun action_table_row1299: Array[Int]

        do
                return [
                                -1, 1, 91 ,
                                9, 0, 1381 
                        ]
        end
        do
                return [
                                -1, 1, 91 ,
                                9, 0, 1381 
                        ]
        end

-       private meth action_table_row1300: Array[Int]
+       private fun action_table_row1300: Array[Int]

        do
                return [
                                -1, 1, 155 
                        ]
        end
        do
                return [
                                -1, 1, 155 
                        ]
        end

-       private meth action_table_row1301: Array[Int]
+       private fun action_table_row1301: Array[Int]

        do
                return [
                                -1, 3, 1300 ,
        do
                return [
                                -1, 3, 1300 ,

@@ -15348,26 +15348,26 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1302: Array[Int]
+       private fun action_table_row1302: Array[Int]

        do
                return [
                                -1, 1, 249 ,
                                9, 0, 1383 
                        ]
        end
        do
                return [
                                -1, 1, 249 ,
                                9, 0, 1383 
                        ]
        end

-       private meth action_table_row1303: Array[Int]
+       private fun action_table_row1303: Array[Int]

        do
                return [
                                -1, 1, 251 
                        ]
        end
        do
                return [
                                -1, 1, 251 
                        ]
        end

-       private meth action_table_row1304: Array[Int]
+       private fun action_table_row1304: Array[Int]

        do
                return [
                                -1, 1, 227 
                        ]
        end
        do
                return [
                                -1, 1, 227 
                        ]
        end

-       private meth action_table_row1305: Array[Int]
+       private fun action_table_row1305: Array[Int]

        do
                return [
                                -1, 3, 1304 ,
        do
                return [
                                -1, 3, 1304 ,

@@ -15395,7 +15395,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1306: Array[Int]
+       private fun action_table_row1306: Array[Int]

        do
                return [
                                -1, 1, 112 ,
        do
                return [
                                -1, 1, 112 ,

@@ -15403,7 +15403,7 @@ abstract class ParserTable
                                58, 0, 1385 
                        ]
        end
                                58, 0, 1385 
                        ]
        end

-       private meth action_table_row1307: Array[Int]
+       private fun action_table_row1307: Array[Int]

        do
                return [
                                -1, 1, 184 ,
        do
                return [
                                -1, 1, 184 ,

@@ -15411,7 +15411,7 @@ abstract class ParserTable
                                58, 0, 1387 
                        ]
        end
                                58, 0, 1387 
                        ]
        end

-       private meth action_table_row1308: Array[Int]
+       private fun action_table_row1308: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15419,14 +15419,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1309: Array[Int]
+       private fun action_table_row1309: Array[Int]

        do
                return [
                                -1, 1, 121 ,
                                58, 0, 1390 
                        ]
        end
        do
                return [
                                -1, 1, 121 ,
                                58, 0, 1390 
                        ]
        end

-       private meth action_table_row1310: Array[Int]
+       private fun action_table_row1310: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15434,14 +15434,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1311: Array[Int]
+       private fun action_table_row1311: Array[Int]

        do
                return [
                                -1, 1, 193 ,
                                58, 0, 1392 
                        ]
        end
        do
                return [
                                -1, 1, 193 ,
                                58, 0, 1392 
                        ]
        end

-       private meth action_table_row1312: Array[Int]
+       private fun action_table_row1312: Array[Int]

        do
                return [
                                -1, 3, 1311 ,
        do
                return [
                                -1, 3, 1311 ,

@@ -15469,7 +15469,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1313: Array[Int]
+       private fun action_table_row1313: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15477,7 +15477,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1314: Array[Int]
+       private fun action_table_row1314: Array[Int]

        do
                return [
                                -1, 3, 1313 ,
        do
                return [
                                -1, 3, 1313 ,

@@ -15505,7 +15505,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1315: Array[Int]
+       private fun action_table_row1315: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15513,7 +15513,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1316: Array[Int]
+       private fun action_table_row1316: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15521,14 +15521,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1317: Array[Int]
+       private fun action_table_row1317: Array[Int]

        do
                return [
                                -1, 1, 129 ,
                                58, 0, 1398 
                        ]
        end
        do
                return [
                                -1, 1, 129 ,
                                58, 0, 1398 
                        ]
        end

-       private meth action_table_row1318: Array[Int]
+       private fun action_table_row1318: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15536,14 +15536,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1319: Array[Int]
+       private fun action_table_row1319: Array[Int]

        do
                return [
                                -1, 1, 201 ,
                                58, 0, 1400 
                        ]
        end
        do
                return [
                                -1, 1, 201 ,
                                58, 0, 1400 
                        ]
        end

-       private meth action_table_row1320: Array[Int]
+       private fun action_table_row1320: Array[Int]

        do
                return [
                                -1, 3, 1319 ,
        do
                return [
                                -1, 3, 1319 ,

@@ -15571,7 +15571,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1321: Array[Int]
+       private fun action_table_row1321: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15579,7 +15579,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1322: Array[Int]
+       private fun action_table_row1322: Array[Int]

        do
                return [
                                -1, 3, 1321 ,
        do
                return [
                                -1, 3, 1321 ,

@@ -15607,7 +15607,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1323: Array[Int]
+       private fun action_table_row1323: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15615,13 +15615,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1324: Array[Int]
+       private fun action_table_row1324: Array[Int]

        do
                return [
                                -1, 1, 140 
                        ]
        end
        do
                return [
                                -1, 1, 140 
                        ]
        end

-       private meth action_table_row1325: Array[Int]
+       private fun action_table_row1325: Array[Int]

        do
                return [
                                -1, 3, 1324 ,
        do
                return [
                                -1, 3, 1324 ,

@@ -15649,13 +15649,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1326: Array[Int]
+       private fun action_table_row1326: Array[Int]

        do
                return [
                                -1, 1, 212 
                        ]
        end
        do
                return [
                                -1, 1, 212 
                        ]
        end

-       private meth action_table_row1327: Array[Int]
+       private fun action_table_row1327: Array[Int]

        do
                return [
                                -1, 3, 1326 ,
        do
                return [
                                -1, 3, 1326 ,

@@ -15683,7 +15683,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1328: Array[Int]
+       private fun action_table_row1328: Array[Int]

        do
                return [
                                -1, 3, 1327 ,
        do
                return [
                                -1, 3, 1327 ,

@@ -15711,7 +15711,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1329: Array[Int]
+       private fun action_table_row1329: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15719,7 +15719,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1330: Array[Int]
+       private fun action_table_row1330: Array[Int]

        do
                return [
                                -1, 3, 1329 ,
        do
                return [
                                -1, 3, 1329 ,

@@ -15747,7 +15747,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1331: Array[Int]
+       private fun action_table_row1331: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15755,13 +15755,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1332: Array[Int]
+       private fun action_table_row1332: Array[Int]

        do
                return [
                                -1, 1, 144 
                        ]
        end
        do
                return [
                                -1, 1, 144 
                        ]
        end

-       private meth action_table_row1333: Array[Int]
+       private fun action_table_row1333: Array[Int]

        do
                return [
                                -1, 3, 1332 ,
        do
                return [
                                -1, 3, 1332 ,

@@ -15789,13 +15789,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1334: Array[Int]
+       private fun action_table_row1334: Array[Int]

        do
                return [
                                -1, 1, 216 
                        ]
        end
        do
                return [
                                -1, 1, 216 
                        ]
        end

-       private meth action_table_row1335: Array[Int]
+       private fun action_table_row1335: Array[Int]

        do
                return [
                                -1, 3, 1334 ,
        do
                return [
                                -1, 3, 1334 ,

@@ -15823,62 +15823,62 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1336: Array[Int]
+       private fun action_table_row1336: Array[Int]

        do
                return [
                                -1, 1, 100 
                        ]
        end
        do
                return [
                                -1, 1, 100 
                        ]
        end

-       private meth action_table_row1337: Array[Int]
+       private fun action_table_row1337: Array[Int]

        do
                return [
                                -1, 1, 92 
                        ]
        end
        do
                return [
                                -1, 1, 92 
                        ]
        end

-       private meth action_table_row1338: Array[Int]
+       private fun action_table_row1338: Array[Int]

        do
                return [
                                -1, 1, 164 
                        ]
        end
        do
                return [
                                -1, 1, 164 
                        ]
        end

-       private meth action_table_row1339: Array[Int]
+       private fun action_table_row1339: Array[Int]

        do
                return [
                                -1, 1, 252 
                        ]
        end
        do
                return [
                                -1, 1, 252 
                        ]
        end

-       private meth action_table_row1340: Array[Int]
+       private fun action_table_row1340: Array[Int]

        do
                return [
                                -1, 1, 236 
                        ]
        end
        do
                return [
                                -1, 1, 236 
                        ]
        end

-       private meth action_table_row1341: Array[Int]
+       private fun action_table_row1341: Array[Int]

        do
                return [
                                -1, 1, 435 
                        ]
        end
        do
                return [
                                -1, 1, 435 
                        ]
        end

-       private meth action_table_row1342: Array[Int]
+       private fun action_table_row1342: Array[Int]

        do
                return [
                                -1, 1, 649 
                        ]
        end
        do
                return [
                                -1, 1, 649 
                        ]
        end

-       private meth action_table_row1343: Array[Int]
+       private fun action_table_row1343: Array[Int]

        do
                return [
                                -1, 1, 584 
                        ]
        end
        do
                return [
                                -1, 1, 584 
                        ]
        end

-       private meth action_table_row1344: Array[Int]
+       private fun action_table_row1344: Array[Int]

        do
                return [
                                -1, 3, 1343 ,
                                16, 0, 1413 
                        ]
        end
        do
                return [
                                -1, 3, 1343 ,
                                16, 0, 1413 
                        ]
        end

-       private meth action_table_row1345: Array[Int]
+       private fun action_table_row1345: Array[Int]

        do
                return [
                                -1, 1, 341 ,
        do
                return [
                                -1, 1, 341 ,

@@ -15912,7 +15912,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1346: Array[Int]
+       private fun action_table_row1346: Array[Int]

        do
                return [
                                -1, 1, 342 ,
        do
                return [
                                -1, 1, 342 ,

@@ -15946,7 +15946,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1347: Array[Int]
+       private fun action_table_row1347: Array[Int]

        do
                return [
                                -1, 3, 1346 ,
        do
                return [
                                -1, 3, 1346 ,

@@ -15954,7 +15954,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1348: Array[Int]
+       private fun action_table_row1348: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -15962,13 +15962,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1349: Array[Int]
+       private fun action_table_row1349: Array[Int]

        do
                return [
                                -1, 1, 525 
                        ]
        end
        do
                return [
                                -1, 1, 525 
                        ]
        end

-       private meth action_table_row1350: Array[Int]
+       private fun action_table_row1350: Array[Int]

        do
                return [
                                -1, 3, 1349 ,
        do
                return [
                                -1, 3, 1349 ,

@@ -15977,7 +15977,7 @@ abstract class ParserTable
                                76, 0, 294 
                        ]
        end
                                76, 0, 294 
                        ]
        end

-       private meth action_table_row1351: Array[Int]
+       private fun action_table_row1351: Array[Int]

        do
                return [
                                -1, 1, 115 ,
        do
                return [
                                -1, 1, 115 ,

@@ -15985,7 +15985,7 @@ abstract class ParserTable
                                58, 0, 1418 
                        ]
        end
                                58, 0, 1418 
                        ]
        end

-       private meth action_table_row1352: Array[Int]
+       private fun action_table_row1352: Array[Int]

        do
                return [
                                -1, 1, 187 ,
        do
                return [
                                -1, 1, 187 ,

@@ -15993,7 +15993,7 @@ abstract class ParserTable
                                58, 0, 1420 
                        ]
        end
                                58, 0, 1420 
                        ]
        end

-       private meth action_table_row1353: Array[Int]
+       private fun action_table_row1353: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16001,14 +16001,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1354: Array[Int]
+       private fun action_table_row1354: Array[Int]

        do
                return [
                                -1, 1, 124 ,
                                58, 0, 1423 
                        ]
        end
        do
                return [
                                -1, 1, 124 ,
                                58, 0, 1423 
                        ]
        end

-       private meth action_table_row1355: Array[Int]
+       private fun action_table_row1355: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16016,14 +16016,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1356: Array[Int]
+       private fun action_table_row1356: Array[Int]

        do
                return [
                                -1, 1, 196 ,
                                58, 0, 1425 
                        ]
        end
        do
                return [
                                -1, 1, 196 ,
                                58, 0, 1425 
                        ]
        end

-       private meth action_table_row1357: Array[Int]
+       private fun action_table_row1357: Array[Int]

        do
                return [
                                -1, 3, 1356 ,
        do
                return [
                                -1, 3, 1356 ,

@@ -16051,7 +16051,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1358: Array[Int]
+       private fun action_table_row1358: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16059,7 +16059,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1359: Array[Int]
+       private fun action_table_row1359: Array[Int]

        do
                return [
                                -1, 3, 1358 ,
        do
                return [
                                -1, 3, 1358 ,

@@ -16087,7 +16087,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1360: Array[Int]
+       private fun action_table_row1360: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16095,7 +16095,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1361: Array[Int]
+       private fun action_table_row1361: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16103,14 +16103,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1362: Array[Int]
+       private fun action_table_row1362: Array[Int]

        do
                return [
                                -1, 1, 132 ,
                                58, 0, 1431 
                        ]
        end
        do
                return [
                                -1, 1, 132 ,
                                58, 0, 1431 
                        ]
        end

-       private meth action_table_row1363: Array[Int]
+       private fun action_table_row1363: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16118,14 +16118,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1364: Array[Int]
+       private fun action_table_row1364: Array[Int]

        do
                return [
                                -1, 1, 204 ,
                                58, 0, 1433 
                        ]
        end
        do
                return [
                                -1, 1, 204 ,
                                58, 0, 1433 
                        ]
        end

-       private meth action_table_row1365: Array[Int]
+       private fun action_table_row1365: Array[Int]

        do
                return [
                                -1, 3, 1364 ,
        do
                return [
                                -1, 3, 1364 ,

@@ -16153,7 +16153,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1366: Array[Int]
+       private fun action_table_row1366: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16161,7 +16161,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1367: Array[Int]
+       private fun action_table_row1367: Array[Int]

        do
                return [
                                -1, 3, 1366 ,
        do
                return [
                                -1, 3, 1366 ,

@@ -16189,7 +16189,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1368: Array[Int]
+       private fun action_table_row1368: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16197,13 +16197,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1369: Array[Int]
+       private fun action_table_row1369: Array[Int]

        do
                return [
                                -1, 1, 143 
                        ]
        end
        do
                return [
                                -1, 1, 143 
                        ]
        end

-       private meth action_table_row1370: Array[Int]
+       private fun action_table_row1370: Array[Int]

        do
                return [
                                -1, 3, 1369 ,
        do
                return [
                                -1, 3, 1369 ,

@@ -16231,13 +16231,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1371: Array[Int]
+       private fun action_table_row1371: Array[Int]

        do
                return [
                                -1, 1, 215 
                        ]
        end
        do
                return [
                                -1, 1, 215 
                        ]
        end

-       private meth action_table_row1372: Array[Int]
+       private fun action_table_row1372: Array[Int]

        do
                return [
                                -1, 3, 1371 ,
        do
                return [
                                -1, 3, 1371 ,

@@ -16265,7 +16265,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1373: Array[Int]
+       private fun action_table_row1373: Array[Int]

        do
                return [
                                -1, 3, 1372 ,
        do
                return [
                                -1, 3, 1372 ,

@@ -16293,7 +16293,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1374: Array[Int]
+       private fun action_table_row1374: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16301,7 +16301,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1375: Array[Int]
+       private fun action_table_row1375: Array[Int]

        do
                return [
                                -1, 3, 1374 ,
        do
                return [
                                -1, 3, 1374 ,

@@ -16329,7 +16329,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1376: Array[Int]
+       private fun action_table_row1376: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16337,13 +16337,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1377: Array[Int]
+       private fun action_table_row1377: Array[Int]

        do
                return [
                                -1, 1, 145 
                        ]
        end
        do
                return [
                                -1, 1, 145 
                        ]
        end

-       private meth action_table_row1378: Array[Int]
+       private fun action_table_row1378: Array[Int]

        do
                return [
                                -1, 3, 1377 ,
        do
                return [
                                -1, 3, 1377 ,

@@ -16371,13 +16371,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1379: Array[Int]
+       private fun action_table_row1379: Array[Int]

        do
                return [
                                -1, 1, 217 
                        ]
        end
        do
                return [
                                -1, 1, 217 
                        ]
        end

-       private meth action_table_row1380: Array[Int]
+       private fun action_table_row1380: Array[Int]

        do
                return [
                                -1, 3, 1379 ,
        do
                return [
                                -1, 3, 1379 ,

@@ -16405,37 +16405,37 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1381: Array[Int]
+       private fun action_table_row1381: Array[Int]

        do
                return [
                                -1, 1, 101 
                        ]
        end
        do
                return [
                                -1, 1, 101 
                        ]
        end

-       private meth action_table_row1382: Array[Int]
+       private fun action_table_row1382: Array[Int]

        do
                return [
                                -1, 1, 93 
                        ]
        end
        do
                return [
                                -1, 1, 93 
                        ]
        end

-       private meth action_table_row1383: Array[Int]
+       private fun action_table_row1383: Array[Int]

        do
                return [
                                -1, 1, 173 
                        ]
        end
        do
                return [
                                -1, 1, 173 
                        ]
        end

-       private meth action_table_row1384: Array[Int]
+       private fun action_table_row1384: Array[Int]

        do
                return [
                                -1, 1, 253 
                        ]
        end
        do
                return [
                                -1, 1, 253 
                        ]
        end

-       private meth action_table_row1385: Array[Int]
+       private fun action_table_row1385: Array[Int]

        do
                return [
                                -1, 1, 245 
                        ]
        end
        do
                return [
                                -1, 1, 245 
                        ]
        end

-       private meth action_table_row1386: Array[Int]
+       private fun action_table_row1386: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16443,14 +16443,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1387: Array[Int]
+       private fun action_table_row1387: Array[Int]

        do
                return [
                                -1, 1, 130 ,
                                58, 0, 1447 
                        ]
        end
        do
                return [
                                -1, 1, 130 ,
                                58, 0, 1447 
                        ]
        end

-       private meth action_table_row1388: Array[Int]
+       private fun action_table_row1388: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16458,14 +16458,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1389: Array[Int]
+       private fun action_table_row1389: Array[Int]

        do
                return [
                                -1, 1, 202 ,
                                58, 0, 1449 
                        ]
        end
        do
                return [
                                -1, 1, 202 ,
                                58, 0, 1449 
                        ]
        end

-       private meth action_table_row1390: Array[Int]
+       private fun action_table_row1390: Array[Int]

        do
                return [
                                -1, 3, 1389 ,
        do
                return [
                                -1, 3, 1389 ,

@@ -16493,7 +16493,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1391: Array[Int]
+       private fun action_table_row1391: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16501,7 +16501,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1392: Array[Int]
+       private fun action_table_row1392: Array[Int]

        do
                return [
                                -1, 3, 1391 ,
        do
                return [
                                -1, 3, 1391 ,

@@ -16529,7 +16529,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1393: Array[Int]
+       private fun action_table_row1393: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16537,13 +16537,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1394: Array[Int]
+       private fun action_table_row1394: Array[Int]

        do
                return [
                                -1, 1, 149 
                        ]
        end
        do
                return [
                                -1, 1, 149 
                        ]
        end

-       private meth action_table_row1395: Array[Int]
+       private fun action_table_row1395: Array[Int]

        do
                return [
                                -1, 3, 1394 ,
        do
                return [
                                -1, 3, 1394 ,

@@ -16571,13 +16571,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1396: Array[Int]
+       private fun action_table_row1396: Array[Int]

        do
                return [
                                -1, 1, 221 
                        ]
        end
        do
                return [
                                -1, 1, 221 
                        ]
        end

-       private meth action_table_row1397: Array[Int]
+       private fun action_table_row1397: Array[Int]

        do
                return [
                                -1, 3, 1396 ,
        do
                return [
                                -1, 3, 1396 ,

@@ -16605,7 +16605,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1398: Array[Int]
+       private fun action_table_row1398: Array[Int]

        do
                return [
                                -1, 3, 1397 ,
        do
                return [
                                -1, 3, 1397 ,

@@ -16633,7 +16633,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1399: Array[Int]
+       private fun action_table_row1399: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16641,7 +16641,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1400: Array[Int]
+       private fun action_table_row1400: Array[Int]

        do
                return [
                                -1, 3, 1399 ,
        do
                return [
                                -1, 3, 1399 ,

@@ -16669,7 +16669,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1401: Array[Int]
+       private fun action_table_row1401: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16677,13 +16677,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1402: Array[Int]
+       private fun action_table_row1402: Array[Int]

        do
                return [
                                -1, 1, 138 
                        ]
        end
        do
                return [
                                -1, 1, 138 
                        ]
        end

-       private meth action_table_row1403: Array[Int]
+       private fun action_table_row1403: Array[Int]

        do
                return [
                                -1, 3, 1402 ,
        do
                return [
                                -1, 3, 1402 ,

@@ -16711,13 +16711,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1404: Array[Int]
+       private fun action_table_row1404: Array[Int]

        do
                return [
                                -1, 1, 210 
                        ]
        end
        do
                return [
                                -1, 1, 210 
                        ]
        end

-       private meth action_table_row1405: Array[Int]
+       private fun action_table_row1405: Array[Int]

        do
                return [
                                -1, 3, 1404 ,
        do
                return [
                                -1, 3, 1404 ,

@@ -16745,25 +16745,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1406: Array[Int]
+       private fun action_table_row1406: Array[Int]

        do
                return [
                                -1, 1, 158 
                        ]
        end
        do
                return [
                                -1, 1, 158 
                        ]
        end

-       private meth action_table_row1407: Array[Int]
+       private fun action_table_row1407: Array[Int]

        do
                return [
                                -1, 1, 230 
                        ]
        end
        do
                return [
                                -1, 1, 230 
                        ]
        end

-       private meth action_table_row1408: Array[Int]
+       private fun action_table_row1408: Array[Int]

        do
                return [
                                -1, 1, 153 
                        ]
        end
        do
                return [
                                -1, 1, 153 
                        ]
        end

-       private meth action_table_row1409: Array[Int]
+       private fun action_table_row1409: Array[Int]

        do
                return [
                                -1, 3, 1408 ,
        do
                return [
                                -1, 3, 1408 ,

@@ -16791,13 +16791,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1410: Array[Int]
+       private fun action_table_row1410: Array[Int]

        do
                return [
                                -1, 1, 225 
                        ]
        end
        do
                return [
                                -1, 1, 225 
                        ]
        end

-       private meth action_table_row1411: Array[Int]
+       private fun action_table_row1411: Array[Int]

        do
                return [
                                -1, 3, 1410 ,
        do
                return [
                                -1, 3, 1410 ,

@@ -16825,19 +16825,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1412: Array[Int]
+       private fun action_table_row1412: Array[Int]

        do
                return [
                                -1, 1, 162 
                        ]
        end
        do
                return [
                                -1, 1, 162 
                        ]
        end

-       private meth action_table_row1413: Array[Int]
+       private fun action_table_row1413: Array[Int]

        do
                return [
                                -1, 1, 234 
                        ]
        end
        do
                return [
                                -1, 1, 234 
                        ]
        end

-       private meth action_table_row1414: Array[Int]
+       private fun action_table_row1414: Array[Int]

        do
                return [
                                -1, 3, 1413 ,
        do
                return [
                                -1, 3, 1413 ,

@@ -16873,7 +16873,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1415: Array[Int]
+       private fun action_table_row1415: Array[Int]

        do
                return [
                                -1, 1, 343 ,
        do
                return [
                                -1, 1, 343 ,

@@ -16907,14 +16907,14 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1416: Array[Int]
+       private fun action_table_row1416: Array[Int]

        do
                return [
                                -1, 3, 1415 ,
                                27, 0, 1465 
                        ]
        end
        do
                return [
                                -1, 3, 1415 ,
                                27, 0, 1465 
                        ]
        end

-       private meth action_table_row1417: Array[Int]
+       private fun action_table_row1417: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16922,7 +16922,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1418: Array[Int]
+       private fun action_table_row1418: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16930,7 +16930,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1419: Array[Int]
+       private fun action_table_row1419: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16938,14 +16938,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1420: Array[Int]
+       private fun action_table_row1420: Array[Int]

        do
                return [
                                -1, 1, 133 ,
                                58, 0, 1469 
                        ]
        end
        do
                return [
                                -1, 1, 133 ,
                                58, 0, 1469 
                        ]
        end

-       private meth action_table_row1421: Array[Int]
+       private fun action_table_row1421: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16953,14 +16953,14 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1422: Array[Int]
+       private fun action_table_row1422: Array[Int]

        do
                return [
                                -1, 1, 205 ,
                                58, 0, 1471 
                        ]
        end
        do
                return [
                                -1, 1, 205 ,
                                58, 0, 1471 
                        ]
        end

-       private meth action_table_row1423: Array[Int]
+       private fun action_table_row1423: Array[Int]

        do
                return [
                                -1, 3, 1422 ,
        do
                return [
                                -1, 3, 1422 ,

@@ -16988,7 +16988,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1424: Array[Int]
+       private fun action_table_row1424: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -16996,7 +16996,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1425: Array[Int]
+       private fun action_table_row1425: Array[Int]

        do
                return [
                                -1, 3, 1424 ,
        do
                return [
                                -1, 3, 1424 ,

@@ -17024,7 +17024,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1426: Array[Int]
+       private fun action_table_row1426: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17032,13 +17032,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1427: Array[Int]
+       private fun action_table_row1427: Array[Int]

        do
                return [
                                -1, 1, 152 
                        ]
        end
        do
                return [
                                -1, 1, 152 
                        ]
        end

-       private meth action_table_row1428: Array[Int]
+       private fun action_table_row1428: Array[Int]

        do
                return [
                                -1, 3, 1427 ,
        do
                return [
                                -1, 3, 1427 ,

@@ -17066,13 +17066,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1429: Array[Int]
+       private fun action_table_row1429: Array[Int]

        do
                return [
                                -1, 1, 224 
                        ]
        end
        do
                return [
                                -1, 1, 224 
                        ]
        end

-       private meth action_table_row1430: Array[Int]
+       private fun action_table_row1430: Array[Int]

        do
                return [
                                -1, 3, 1429 ,
        do
                return [
                                -1, 3, 1429 ,

@@ -17100,7 +17100,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1431: Array[Int]
+       private fun action_table_row1431: Array[Int]

        do
                return [
                                -1, 3, 1430 ,
        do
                return [
                                -1, 3, 1430 ,

@@ -17128,7 +17128,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1432: Array[Int]
+       private fun action_table_row1432: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17136,7 +17136,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1433: Array[Int]
+       private fun action_table_row1433: Array[Int]

        do
                return [
                                -1, 3, 1432 ,
        do
                return [
                                -1, 3, 1432 ,

@@ -17164,7 +17164,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1434: Array[Int]
+       private fun action_table_row1434: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17172,13 +17172,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1435: Array[Int]
+       private fun action_table_row1435: Array[Int]

        do
                return [
                                -1, 1, 141 
                        ]
        end
        do
                return [
                                -1, 1, 141 
                        ]
        end

-       private meth action_table_row1436: Array[Int]
+       private fun action_table_row1436: Array[Int]

        do
                return [
                                -1, 3, 1435 ,
        do
                return [
                                -1, 3, 1435 ,

@@ -17206,13 +17206,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1437: Array[Int]
+       private fun action_table_row1437: Array[Int]

        do
                return [
                                -1, 1, 213 
                        ]
        end
        do
                return [
                                -1, 1, 213 
                        ]
        end

-       private meth action_table_row1438: Array[Int]
+       private fun action_table_row1438: Array[Int]

        do
                return [
                                -1, 3, 1437 ,
        do
                return [
                                -1, 3, 1437 ,

@@ -17240,25 +17240,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1439: Array[Int]
+       private fun action_table_row1439: Array[Int]

        do
                return [
                                -1, 1, 161 
                        ]
        end
        do
                return [
                                -1, 1, 161 
                        ]
        end

-       private meth action_table_row1440: Array[Int]
+       private fun action_table_row1440: Array[Int]

        do
                return [
                                -1, 1, 233 
                        ]
        end
        do
                return [
                                -1, 1, 233 
                        ]
        end

-       private meth action_table_row1441: Array[Int]
+       private fun action_table_row1441: Array[Int]

        do
                return [
                                -1, 1, 154 
                        ]
        end
        do
                return [
                                -1, 1, 154 
                        ]
        end

-       private meth action_table_row1442: Array[Int]
+       private fun action_table_row1442: Array[Int]

        do
                return [
                                -1, 3, 1441 ,
        do
                return [
                                -1, 3, 1441 ,

@@ -17286,13 +17286,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1443: Array[Int]
+       private fun action_table_row1443: Array[Int]

        do
                return [
                                -1, 1, 226 
                        ]
        end
        do
                return [
                                -1, 1, 226 
                        ]
        end

-       private meth action_table_row1444: Array[Int]
+       private fun action_table_row1444: Array[Int]

        do
                return [
                                -1, 3, 1443 ,
        do
                return [
                                -1, 3, 1443 ,

@@ -17320,19 +17320,19 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1445: Array[Int]
+       private fun action_table_row1445: Array[Int]

        do
                return [
                                -1, 1, 163 
                        ]
        end
        do
                return [
                                -1, 1, 163 
                        ]
        end

-       private meth action_table_row1446: Array[Int]
+       private fun action_table_row1446: Array[Int]

        do
                return [
                                -1, 1, 235 
                        ]
        end
        do
                return [
                                -1, 1, 235 
                        ]
        end

-       private meth action_table_row1447: Array[Int]
+       private fun action_table_row1447: Array[Int]

        do
                return [
                                -1, 3, 1446 ,
        do
                return [
                                -1, 3, 1446 ,

@@ -17360,7 +17360,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1448: Array[Int]
+       private fun action_table_row1448: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17368,7 +17368,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1449: Array[Int]
+       private fun action_table_row1449: Array[Int]

        do
                return [
                                -1, 3, 1448 ,
        do
                return [
                                -1, 3, 1448 ,

@@ -17396,7 +17396,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1450: Array[Int]
+       private fun action_table_row1450: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17404,13 +17404,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1451: Array[Int]
+       private fun action_table_row1451: Array[Int]

        do
                return [
                                -1, 1, 139 
                        ]
        end
        do
                return [
                                -1, 1, 139 
                        ]
        end

-       private meth action_table_row1452: Array[Int]
+       private fun action_table_row1452: Array[Int]

        do
                return [
                                -1, 3, 1451 ,
        do
                return [
                                -1, 3, 1451 ,

@@ -17438,13 +17438,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1453: Array[Int]
+       private fun action_table_row1453: Array[Int]

        do
                return [
                                -1, 1, 211 
                        ]
        end
        do
                return [
                                -1, 1, 211 
                        ]
        end

-       private meth action_table_row1454: Array[Int]
+       private fun action_table_row1454: Array[Int]

        do
                return [
                                -1, 3, 1453 ,
        do
                return [
                                -1, 3, 1453 ,

@@ -17472,25 +17472,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1455: Array[Int]
+       private fun action_table_row1455: Array[Int]

        do
                return [
                                -1, 1, 167 
                        ]
        end
        do
                return [
                                -1, 1, 167 
                        ]
        end

-       private meth action_table_row1456: Array[Int]
+       private fun action_table_row1456: Array[Int]

        do
                return [
                                -1, 1, 239 
                        ]
        end
        do
                return [
                                -1, 1, 239 
                        ]
        end

-       private meth action_table_row1457: Array[Int]
+       private fun action_table_row1457: Array[Int]

        do
                return [
                                -1, 1, 147 
                        ]
        end
        do
                return [
                                -1, 1, 147 
                        ]
        end

-       private meth action_table_row1458: Array[Int]
+       private fun action_table_row1458: Array[Int]

        do
                return [
                                -1, 3, 1457 ,
        do
                return [
                                -1, 3, 1457 ,

@@ -17518,13 +17518,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1459: Array[Int]
+       private fun action_table_row1459: Array[Int]

        do
                return [
                                -1, 1, 219 
                        ]
        end
        do
                return [
                                -1, 1, 219 
                        ]
        end

-       private meth action_table_row1460: Array[Int]
+       private fun action_table_row1460: Array[Int]

        do
                return [
                                -1, 3, 1459 ,
        do
                return [
                                -1, 3, 1459 ,

@@ -17552,37 +17552,37 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1461: Array[Int]
+       private fun action_table_row1461: Array[Int]

        do
                return [
                                -1, 1, 156 
                        ]
        end
        do
                return [
                                -1, 1, 156 
                        ]
        end

-       private meth action_table_row1462: Array[Int]
+       private fun action_table_row1462: Array[Int]

        do
                return [
                                -1, 1, 228 
                        ]
        end
        do
                return [
                                -1, 1, 228 
                        ]
        end

-       private meth action_table_row1463: Array[Int]
+       private fun action_table_row1463: Array[Int]

        do
                return [
                                -1, 1, 171 
                        ]
        end
        do
                return [
                                -1, 1, 171 
                        ]
        end

-       private meth action_table_row1464: Array[Int]
+       private fun action_table_row1464: Array[Int]

        do
                return [
                                -1, 1, 243 
                        ]
        end
        do
                return [
                                -1, 1, 243 
                        ]
        end

-       private meth action_table_row1465: Array[Int]
+       private fun action_table_row1465: Array[Int]

        do
                return [
                                -1, 1, 586 
                        ]
        end
        do
                return [
                                -1, 1, 586 
                        ]
        end

-       private meth action_table_row1466: Array[Int]
+       private fun action_table_row1466: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17590,21 +17590,21 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1467: Array[Int]
+       private fun action_table_row1467: Array[Int]

        do
                return [
                                -1, 3, 1466 ,
                                46, 0, 1495 
                        ]
        end
        do
                return [
                                -1, 3, 1466 ,
                                46, 0, 1495 
                        ]
        end

-       private meth action_table_row1468: Array[Int]
+       private fun action_table_row1468: Array[Int]

        do
                return [
                                -1, 3, 1467 ,
                                52, 0, 1496 
                        ]
        end
        do
                return [
                                -1, 3, 1467 ,
                                52, 0, 1496 
                        ]
        end

-       private meth action_table_row1469: Array[Int]
+       private fun action_table_row1469: Array[Int]

        do
                return [
                                -1, 3, 1468 ,
        do
                return [
                                -1, 3, 1468 ,

@@ -17632,7 +17632,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1470: Array[Int]
+       private fun action_table_row1470: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17640,7 +17640,7 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1471: Array[Int]
+       private fun action_table_row1471: Array[Int]

        do
                return [
                                -1, 3, 1470 ,
        do
                return [
                                -1, 3, 1470 ,

@@ -17668,7 +17668,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1472: Array[Int]
+       private fun action_table_row1472: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17676,13 +17676,13 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1473: Array[Int]
+       private fun action_table_row1473: Array[Int]

        do
                return [
                                -1, 1, 142 
                        ]
        end
        do
                return [
                                -1, 1, 142 
                        ]
        end

-       private meth action_table_row1474: Array[Int]
+       private fun action_table_row1474: Array[Int]

        do
                return [
                                -1, 3, 1473 ,
        do
                return [
                                -1, 3, 1473 ,

@@ -17710,13 +17710,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1475: Array[Int]
+       private fun action_table_row1475: Array[Int]

        do
                return [
                                -1, 1, 214 
                        ]
        end
        do
                return [
                                -1, 1, 214 
                        ]
        end

-       private meth action_table_row1476: Array[Int]
+       private fun action_table_row1476: Array[Int]

        do
                return [
                                -1, 3, 1475 ,
        do
                return [
                                -1, 3, 1475 ,

@@ -17744,25 +17744,25 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1477: Array[Int]
+       private fun action_table_row1477: Array[Int]

        do
                return [
                                -1, 1, 170 
                        ]
        end
        do
                return [
                                -1, 1, 170 
                        ]
        end

-       private meth action_table_row1478: Array[Int]
+       private fun action_table_row1478: Array[Int]

        do
                return [
                                -1, 1, 242 
                        ]
        end
        do
                return [
                                -1, 1, 242 
                        ]
        end

-       private meth action_table_row1479: Array[Int]
+       private fun action_table_row1479: Array[Int]

        do
                return [
                                -1, 1, 150 
                        ]
        end
        do
                return [
                                -1, 1, 150 
                        ]
        end

-       private meth action_table_row1480: Array[Int]
+       private fun action_table_row1480: Array[Int]

        do
                return [
                                -1, 3, 1479 ,
        do
                return [
                                -1, 3, 1479 ,

@@ -17790,13 +17790,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1481: Array[Int]
+       private fun action_table_row1481: Array[Int]

        do
                return [
                                -1, 1, 222 
                        ]
        end
        do
                return [
                                -1, 1, 222 
                        ]
        end

-       private meth action_table_row1482: Array[Int]
+       private fun action_table_row1482: Array[Int]

        do
                return [
                                -1, 3, 1481 ,
        do
                return [
                                -1, 3, 1481 ,

@@ -17824,37 +17824,37 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1483: Array[Int]
+       private fun action_table_row1483: Array[Int]

        do
                return [
                                -1, 1, 159 
                        ]
        end
        do
                return [
                                -1, 1, 159 
                        ]
        end

-       private meth action_table_row1484: Array[Int]
+       private fun action_table_row1484: Array[Int]

        do
                return [
                                -1, 1, 231 
                        ]
        end
        do
                return [
                                -1, 1, 231 
                        ]
        end

-       private meth action_table_row1485: Array[Int]
+       private fun action_table_row1485: Array[Int]

        do
                return [
                                -1, 1, 172 
                        ]
        end
        do
                return [
                                -1, 1, 172 
                        ]
        end

-       private meth action_table_row1486: Array[Int]
+       private fun action_table_row1486: Array[Int]

        do
                return [
                                -1, 1, 244 
                        ]
        end
        do
                return [
                                -1, 1, 244 
                        ]
        end

-       private meth action_table_row1487: Array[Int]
+       private fun action_table_row1487: Array[Int]

        do
                return [
                                -1, 1, 148 
                        ]
        end
        do
                return [
                                -1, 1, 148 
                        ]
        end

-       private meth action_table_row1488: Array[Int]
+       private fun action_table_row1488: Array[Int]

        do
                return [
                                -1, 3, 1487 ,
        do
                return [
                                -1, 3, 1487 ,

@@ -17882,13 +17882,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1489: Array[Int]
+       private fun action_table_row1489: Array[Int]

        do
                return [
                                -1, 1, 220 
                        ]
        end
        do
                return [
                                -1, 1, 220 
                        ]
        end

-       private meth action_table_row1490: Array[Int]
+       private fun action_table_row1490: Array[Int]

        do
                return [
                                -1, 3, 1489 ,
        do
                return [
                                -1, 3, 1489 ,

@@ -17916,31 +17916,31 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1491: Array[Int]
+       private fun action_table_row1491: Array[Int]

        do
                return [
                                -1, 1, 157 
                        ]
        end
        do
                return [
                                -1, 1, 157 
                        ]
        end

-       private meth action_table_row1492: Array[Int]
+       private fun action_table_row1492: Array[Int]

        do
                return [
                                -1, 1, 229 
                        ]
        end
        do
                return [
                                -1, 1, 229 
                        ]
        end

-       private meth action_table_row1493: Array[Int]
+       private fun action_table_row1493: Array[Int]

        do
                return [
                                -1, 1, 165 
                        ]
        end
        do
                return [
                                -1, 1, 165 
                        ]
        end

-       private meth action_table_row1494: Array[Int]
+       private fun action_table_row1494: Array[Int]

        do
                return [
                                -1, 1, 237 
                        ]
        end
        do
                return [
                                -1, 1, 237 
                        ]
        end

-       private meth action_table_row1495: Array[Int]
+       private fun action_table_row1495: Array[Int]

        do
                return [
                                -1, 3, 1494 ,
        do
                return [
                                -1, 3, 1494 ,

@@ -17967,7 +17967,7 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1496: Array[Int]
+       private fun action_table_row1496: Array[Int]

        do
                return [
                                -1, 1, 467 ,
        do
                return [
                                -1, 1, 467 ,

@@ -17975,19 +17975,19 @@ abstract class ParserTable
                                1, 0, 2 
                        ]
        end
                                1, 0, 2 
                        ]
        end

-       private meth action_table_row1497: Array[Int]
+       private fun action_table_row1497: Array[Int]

        do
                return [
                                -1, 1, 536 
                        ]
        end
        do
                return [
                                -1, 1, 536 
                        ]
        end

-       private meth action_table_row1498: Array[Int]
+       private fun action_table_row1498: Array[Int]

        do
                return [
                                -1, 1, 151 
                        ]
        end
        do
                return [
                                -1, 1, 151 
                        ]
        end

-       private meth action_table_row1499: Array[Int]
+       private fun action_table_row1499: Array[Int]

        do
                return [
                                -1, 3, 1498 ,
        do
                return [
                                -1, 3, 1498 ,

@@ -18015,13 +18015,13 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1500: Array[Int]
+       private fun action_table_row1500: Array[Int]

        do
                return [
                                -1, 1, 223 
                        ]
        end
        do
                return [
                                -1, 1, 223 
                        ]
        end

-       private meth action_table_row1501: Array[Int]
+       private fun action_table_row1501: Array[Int]

        do
                return [
                                -1, 3, 1500 ,
        do
                return [
                                -1, 3, 1500 ,

@@ -18049,76 +18049,76 @@ abstract class ParserTable
                                83, 0, 53 
                        ]
        end
                                83, 0, 53 
                        ]
        end

-       private meth action_table_row1502: Array[Int]
+       private fun action_table_row1502: Array[Int]

        do
                return [
                                -1, 1, 160 
                        ]
        end
        do
                return [
                                -1, 1, 160 
                        ]
        end

-       private meth action_table_row1503: Array[Int]
+       private fun action_table_row1503: Array[Int]

        do
                return [
                                -1, 1, 232 
                        ]
        end
        do
                return [
                                -1, 1, 232 
                        ]
        end

-       private meth action_table_row1504: Array[Int]
+       private fun action_table_row1504: Array[Int]

        do
                return [
                                -1, 1, 168 
                        ]
        end
        do
                return [
                                -1, 1, 168 
                        ]
        end

-       private meth action_table_row1505: Array[Int]
+       private fun action_table_row1505: Array[Int]

        do
                return [
                                -1, 1, 240 
                        ]
        end
        do
                return [
                                -1, 1, 240 
                        ]
        end

-       private meth action_table_row1506: Array[Int]
+       private fun action_table_row1506: Array[Int]

        do
                return [
                                -1, 1, 166 
                        ]
        end
        do
                return [
                                -1, 1, 166 
                        ]
        end

-       private meth action_table_row1507: Array[Int]
+       private fun action_table_row1507: Array[Int]

        do
                return [
                                -1, 1, 238 
                        ]
        end
        do
                return [
                                -1, 1, 238 
                        ]
        end

-       private meth action_table_row1508: Array[Int]
+       private fun action_table_row1508: Array[Int]

        do
                return [
                                -1, 1, 487 
                        ]
        end
        do
                return [
                                -1, 1, 487 
                        ]
        end

-       private meth action_table_row1509: Array[Int]
+       private fun action_table_row1509: Array[Int]

        do
                return [
                                -1, 3, 1508 ,
                                52, 0, 1511 
                        ]
        end
        do
                return [
                                -1, 3, 1508 ,
                                52, 0, 1511 
                        ]
        end

-       private meth action_table_row1510: Array[Int]
+       private fun action_table_row1510: Array[Int]

        do
                return [
                                -1, 1, 169 
                        ]
        end
        do
                return [
                                -1, 1, 169 
                        ]
        end

-       private meth action_table_row1511: Array[Int]
+       private fun action_table_row1511: Array[Int]

        do
                return [
                                -1, 1, 241 
                        ]
        end
        do
                return [
                                -1, 1, 241 
                        ]
        end

-       private meth action_table_row1512: Array[Int]
+       private fun action_table_row1512: Array[Int]

        do
                return [
                                -1, 1, 537 
                        ]
        end
 
        do
                return [
                                -1, 1, 537 
                        ]
        end
 

-       attr _goto_table: Array[Array[Int]]
-       private meth build_goto_table
+       var _goto_table: Array[Array[Int]]
+       private fun build_goto_table

        do
                _goto_table = once [ 
                        [
        do
                _goto_table = once [ 
                        [

@@ -19733,7 +19733,7 @@ abstract class ParserTable
                ]
        end
 
                ]
        end
 

-       private meth error_messages: Array[String]
+       private fun error_messages: Array[String]

        do
                return once [
                        "expecting: eol, comment, 'package', 'import', 'class', 'abstract', 'interface', 'universal', kwmeth, 'init', 'redef', 'do', 'var', 'protected', 'private', 'intrude', 'if', 'while', 'for', 'return', 'continue', 'break', 'abort', 'assert', 'new', 'super', 'self', 'true', 'false', 'null', '(', '[', classid, id, attrid, number, float, char, string, start string, EOF" ,
        do
                return once [
                        "expecting: eol, comment, 'package', 'import', 'class', 'abstract', 'interface', 'universal', kwmeth, 'init', 'redef', 'do', 'var', 'protected', 'private', 'intrude', 'if', 'while', 'for', 'return', 'continue', 'break', 'abort', 'assert', 'new', 'super', 'self', 'true', 'false', 'null', '(', '[', classid, id, attrid, number, float, char, string, start string, EOF" ,

@@ -19936,7 +19936,7 @@ abstract class ParserTable
                ]
        end
 
                ]
        end
 

-       private meth errors: Array[Int]
+       private fun errors: Array[Int]

        do
                return once [
                        0 , 1 , 1 , 2 , 3 , 3 , 2 , 2 , 4 , 5 , 6 , 7 , 8 , 3 , 4 , 1 , 1 , 2 , 9 , 8 , 3 , 4 , 10 , 11 , 12 , 13 , 14 , 15 , 15 , 15 , 16 , 16 , 10 , 17 , 17 , 17 , 18 , 19 , 20 , 11 , 21 , 21 , 21 , 21 , 19 , 16 , 22 , 23 , 24 , 21 , 21 , 21 , 21 , 16 , 25 , 26 , 18 , 18 , 18 , 18 , 18 , 18 , 18 , 27 , 21 , 28 , 16 , 21 , 29 , 30 , 29 , 30 , 1 , 31 , 31 , 32 , 3 , 2 , 8 , 4 , 2 , 4 , 33 , 8 , 1 , 1 , 1 , 32 , 2 , 8 , 4 , 2 , 8 , 34 , 14 , 35 , 16 , 36 , 20 , 37 , 35 , 38 , 38 , 38 , 38 , 39 , 40 , 37 , 41 , 38 , 38 , 38 , 38 , 38 , 38 , 21 , 18 , 29 , 42 , 43 , 43 , 43 , 44 , 45 , 45 , 45 , 38 , 46 , 18 , 18 , 18 , 47 , 48 , 49 , 49 , 49 , 19 , 19 , 14 , 50 , 16 , 51 , 20 , 52 , 50 , 53 , 52 , 54 , 21 , 18 , 18 , 55 , 55 , 55 , 56 , 57 , 57 , 57 , 58 , 29 , 18 , 18 , 59 , 19 , 18 , 60 , 21 , 18 , 61 , 62 , 21 , 19 , 63 , 64 , 24 , 65 , 19 , 19 , 19 , 19 , 66 , 67 , 68 , 67 , 67 , 69 , 67 , 26 , 70 , 2 , 26 , 16 , 71 , 24 , 16 , 72 , 28 , 16 , 72 , 28 , 19 , 11 , 22 , 30 , 29 , 1 , 2 , 73 , 32 , 8 , 32 , 32 , 2 , 8 , 46 , 32 , 2 , 32 , 32 , 2 , 8 , 32 , 8 , 40 , 38 , 19 , 74 , 60 , 75 , 38 , 20 , 38 , 76 , 77 , 75 , 38 , 35 , 36 , 36 , 37 , 20 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 71 , 69 , 67 , 18 , 8 , 20 , 16 , 78 , 79 , 80 , 81 , 19 , 82 , 60 , 83 , 21 , 27 , 83 , 84 , 51 , 51 , 52 , 20 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 71 , 84 , 50 , 19 , 18 , 85 , 86 , 76 , 21 , 21 , 71 , 21 , 87 , 29 , 30 , 19 , 19 , 88 , 18 , 18 , 89 , 18 , 18 , 90 , 67 , 91 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 93 , 92 , 85 , 26 , 26 , 2 , 19 , 94 , 19 , 19 , 19 , 28 , 72 , 95 , 21 , 18 , 96 , 97 , 32 , 2 , 32 , 2 , 32 , 32 , 2 , 32 , 2 , 2 , 32 , 32 , 2 , 32 , 3 , 77 , 79 , 43 , 35 , 45 , 60 , 71 , 98 , 99 , 45 , 38 , 74 , 74 , 75 , 60 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 94 , 92 , 85 , 47 , 8 , 60 , 19 , 16 , 100 , 101 , 102 , 79 , 55 , 103 , 57 , 71 , 57 , 18 , 82 , 82 , 83 , 60 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 94 , 18 , 86 , 20 , 10 , 94 , 104 , 18 , 18 , 13 , 105 , 105 , 18 , 8 , 8 , 93 , 92 , 106 , 107 , 108 , 107 , 109 , 110 , 111 , 112 , 11 , 113 , 114 , 24 , 18 , 18 , 95 , 28 , 97 , 2 , 2 , 32 , 2 , 2 , 2 , 32 , 2 , 72 , 99 , 100 , 10 , 45 , 76 , 94 , 115 , 43 , 43 , 116 , 43 , 45 , 45 , 116 , 116 , 116 , 116 , 116 , 116 , 116 , 45 , 45 , 45 , 35 , 113 , 35 , 38 , 107 , 111 , 18 , 47 , 117 , 18 , 19 , 118 , 13 , 16 , 100 , 57 , 94 , 55 , 55 , 119 , 55 , 57 , 57 , 119 , 119 , 119 , 119 , 119 , 119 , 119 , 57 , 57 , 57 , 50 , 120 , 21 , 20 , 60 , 14 , 50 , 121 , 16 , 122 , 123 , 124 , 18 , 125 , 13 , 126 , 3 , 3 , 92 , 127 , 128 , 13 , 107 , 109 , 110 , 107 , 110 , 129 , 110 , 110 , 67 , 130 , 130 , 8 , 131 , 130 , 124 , 21 , 18 , 132 , 24 , 65 , 19 , 19 , 28 , 2 , 2 , 115 , 16 , 14 , 38 , 98 , 115 , 38 , 132 , 38 , 128 , 13 , 130 , 8 , 131 , 130 , 18 , 18 , 18 , 133 , 13 , 14 , 16 , 13 , 16 , 10 , 134 , 134 , 134 , 135 , 19 , 133 , 136 , 24 , 18 , 18 , 27 , 29 , 137 , 138 , 138 , 138 , 138 , 138 , 138 , 138 , 138 , 18 , 19 , 16 , 21 , 84 , 60 , 112 , 139 , 50 , 21 , 19 , 140 , 121 , 123 , 8 , 18 , 125 , 10 , 108 , 141 , 99 , 142 , 143 , 107 , 110 , 10 , 14 , 110 , 85 , 8 , 131 , 130 , 144 , 20 , 4 , 145 , 146 , 147 , 148 , 130 , 8 , 131 , 149 , 19 , 19 , 18 , 18 , 18 , 72 , 115 , 19 , 35 , 98 , 149 , 142 , 143 , 8 , 131 , 130 , 144 , 4 , 8 , 131 , 135 , 135 , 47 , 138 , 138 , 150 , 19 , 18 , 19 , 14 , 151 , 135 , 152 , 138 , 138 , 138 , 153 , 19 , 138 , 135 , 24 , 42 , 19 , 19 , 71 , 24 , 133 , 8 , 18 , 13 , 80 , 19 , 18 , 139 , 20 , 112 , 112 , 91 , 21 , 154 , 155 , 16 , 156 , 20 , 157 , 155 , 158 , 158 , 158 , 158 , 159 , 19 , 157 , 160 , 158 , 158 , 158 , 158 , 158 , 158 , 29 , 161 , 162 , 162 , 162 , 163 , 164 , 164 , 164 , 158 , 125 , 8 , 8 , 14 , 165 , 10 , 99 , 62 , 99 , 8 , 8 , 14 , 166 , 167 , 112 , 144 , 4 , 8 , 131 , 144 , 8 , 168 , 144 , 60 , 146 , 147 , 148 , 169 , 147 , 170 , 171 , 170 , 69 , 85 , 172 , 173 , 172 , 144 , 4 , 174 , 18 , 18 , 72 , 175 , 38 , 174 , 8 , 8 , 144 , 4 , 8 , 131 , 168 , 144 , 144 , 4 , 135 , 8 , 16 , 176 , 79 , 80 , 81 , 177 , 71 , 177 , 138 , 19 , 19 , 88 , 89 , 138 , 138 , 138 , 138 , 94 , 19 , 19 , 135 , 137 , 8 , 18 , 101 , 175 , 91 , 60 , 112 , 178 , 123 , 158 , 19 , 179 , 60 , 180 , 158 , 20 , 158 , 76 , 62 , 180 , 158 , 155 , 181 , 156 , 156 , 157 , 20 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 71 , 125 , 125 , 8 , 105 , 99 , 14 , 108 , 99 , 62 , 166 , 80 , 182 , 80 , 112 , 67 , 112 , 91 , 112 , 168 , 144 , 144 , 4 , 144 , 4 , 144 , 168 , 130 , 169 , 147 , 170 , 171 , 170 , 69 , 85 , 172 , 173 , 172 , 147 , 170 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 92 , 183 , 184 , 185 , 101 , 184 , 168 , 144 , 186 , 187 , 138 , 186 , 187 , 168 , 144 , 144 , 4 , 4 , 168 , 168 , 144 , 47 , 8 , 19 , 16 , 100 , 101 , 102 , 138 , 94 , 138 , 138 , 138 , 13 , 105 , 138 , 133 , 188 , 24 , 138 , 138 , 18 , 137 , 13 , 138 , 178 , 112 , 79 , 162 , 85 , 155 , 155 , 164 , 60 , 71 , 158 , 164 , 158 , 21 , 21 , 179 , 179 , 180 , 60 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 94 , 125 , 99 , 108 , 80 , 13 , 110 , 80 , 85 , 130 , 112 , 91 , 4 , 168 , 168 , 144 , 4 , 147 , 170 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 92 , 183 , 184 , 185 , 101 , 184 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 107 , 8 , 16 , 189 , 101 , 13 , 16 , 189 , 4 , 168 , 190 , 62 , 191 , 190 , 62 , 4 , 168 , 168 , 144 , 4 , 4 , 168 , 135 , 47 , 138 , 19 , 118 , 13 , 16 , 192 , 125 , 138 , 13 , 135 , 24 , 42 , 19 , 19 , 18 , 18 , 16 , 100 , 155 , 10 , 164 , 76 , 94 , 162 , 162 , 193 , 162 , 164 , 164 , 193 , 193 , 193 , 193 , 193 , 193 , 193 , 164 , 164 , 164 , 155 , 113 , 155 , 158 , 13 , 110 , 8 , 112 , 130 , 4 , 4 , 168 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 107 , 8 , 16 , 189 , 101 , 13 , 16 , 189 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 194 , 13 , 19 , 16 , 13 , 143 , 19 , 16 , 4 , 187 , 21 , 195 , 187 , 38 , 4 , 4 , 168 , 4 , 135 , 138 , 138 , 138 , 19 , 177 , 8 , 125 , 138 , 19 , 19 , 138 , 138 , 138 , 19 , 16 , 14 , 158 , 158 , 132 , 158 , 8 , 110 , 4 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 194 , 13 , 19 , 16 , 13 , 143 , 19 , 16 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 8 , 142 , 143 , 8 , 19 , 143 , 8 , 8 , 19 , 62 , 42 , 62 , 4 , 13 , 80 , 138 , 125 , 8 , 8 , 138 , 138 , 196 , 19 , 155 , 149 , 110 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 8 , 142 , 143 , 8 , 19 , 143 , 8 , 8 , 19 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 21 , 38 , 138 , 101 , 125 , 125 , 8 , 175 , 158 , 174 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 13 , 125 , 138 , 186 , 187 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 138 , 122 , 190 , 62 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 140 , 187 , 158 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 8 , 161 , 62 , 8 , 8 , 158  
        do
                return once [
                        0 , 1 , 1 , 2 , 3 , 3 , 2 , 2 , 4 , 5 , 6 , 7 , 8 , 3 , 4 , 1 , 1 , 2 , 9 , 8 , 3 , 4 , 10 , 11 , 12 , 13 , 14 , 15 , 15 , 15 , 16 , 16 , 10 , 17 , 17 , 17 , 18 , 19 , 20 , 11 , 21 , 21 , 21 , 21 , 19 , 16 , 22 , 23 , 24 , 21 , 21 , 21 , 21 , 16 , 25 , 26 , 18 , 18 , 18 , 18 , 18 , 18 , 18 , 27 , 21 , 28 , 16 , 21 , 29 , 30 , 29 , 30 , 1 , 31 , 31 , 32 , 3 , 2 , 8 , 4 , 2 , 4 , 33 , 8 , 1 , 1 , 1 , 32 , 2 , 8 , 4 , 2 , 8 , 34 , 14 , 35 , 16 , 36 , 20 , 37 , 35 , 38 , 38 , 38 , 38 , 39 , 40 , 37 , 41 , 38 , 38 , 38 , 38 , 38 , 38 , 21 , 18 , 29 , 42 , 43 , 43 , 43 , 44 , 45 , 45 , 45 , 38 , 46 , 18 , 18 , 18 , 47 , 48 , 49 , 49 , 49 , 19 , 19 , 14 , 50 , 16 , 51 , 20 , 52 , 50 , 53 , 52 , 54 , 21 , 18 , 18 , 55 , 55 , 55 , 56 , 57 , 57 , 57 , 58 , 29 , 18 , 18 , 59 , 19 , 18 , 60 , 21 , 18 , 61 , 62 , 21 , 19 , 63 , 64 , 24 , 65 , 19 , 19 , 19 , 19 , 66 , 67 , 68 , 67 , 67 , 69 , 67 , 26 , 70 , 2 , 26 , 16 , 71 , 24 , 16 , 72 , 28 , 16 , 72 , 28 , 19 , 11 , 22 , 30 , 29 , 1 , 2 , 73 , 32 , 8 , 32 , 32 , 2 , 8 , 46 , 32 , 2 , 32 , 32 , 2 , 8 , 32 , 8 , 40 , 38 , 19 , 74 , 60 , 75 , 38 , 20 , 38 , 76 , 77 , 75 , 38 , 35 , 36 , 36 , 37 , 20 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 37 , 71 , 69 , 67 , 18 , 8 , 20 , 16 , 78 , 79 , 80 , 81 , 19 , 82 , 60 , 83 , 21 , 27 , 83 , 84 , 51 , 51 , 52 , 20 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 52 , 71 , 84 , 50 , 19 , 18 , 85 , 86 , 76 , 21 , 21 , 71 , 21 , 87 , 29 , 30 , 19 , 19 , 88 , 18 , 18 , 89 , 18 , 18 , 90 , 67 , 91 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 92 , 93 , 92 , 85 , 26 , 26 , 2 , 19 , 94 , 19 , 19 , 19 , 28 , 72 , 95 , 21 , 18 , 96 , 97 , 32 , 2 , 32 , 2 , 32 , 32 , 2 , 32 , 2 , 2 , 32 , 32 , 2 , 32 , 3 , 77 , 79 , 43 , 35 , 45 , 60 , 71 , 98 , 99 , 45 , 38 , 74 , 74 , 75 , 60 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 75 , 94 , 92 , 85 , 47 , 8 , 60 , 19 , 16 , 100 , 101 , 102 , 79 , 55 , 103 , 57 , 71 , 57 , 18 , 82 , 82 , 83 , 60 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 83 , 94 , 18 , 86 , 20 , 10 , 94 , 104 , 18 , 18 , 13 , 105 , 105 , 18 , 8 , 8 , 93 , 92 , 106 , 107 , 108 , 107 , 109 , 110 , 111 , 112 , 11 , 113 , 114 , 24 , 18 , 18 , 95 , 28 , 97 , 2 , 2 , 32 , 2 , 2 , 2 , 32 , 2 , 72 , 99 , 100 , 10 , 45 , 76 , 94 , 115 , 43 , 43 , 116 , 43 , 45 , 45 , 116 , 116 , 116 , 116 , 116 , 116 , 116 , 45 , 45 , 45 , 35 , 113 , 35 , 38 , 107 , 111 , 18 , 47 , 117 , 18 , 19 , 118 , 13 , 16 , 100 , 57 , 94 , 55 , 55 , 119 , 55 , 57 , 57 , 119 , 119 , 119 , 119 , 119 , 119 , 119 , 57 , 57 , 57 , 50 , 120 , 21 , 20 , 60 , 14 , 50 , 121 , 16 , 122 , 123 , 124 , 18 , 125 , 13 , 126 , 3 , 3 , 92 , 127 , 128 , 13 , 107 , 109 , 110 , 107 , 110 , 129 , 110 , 110 , 67 , 130 , 130 , 8 , 131 , 130 , 124 , 21 , 18 , 132 , 24 , 65 , 19 , 19 , 28 , 2 , 2 , 115 , 16 , 14 , 38 , 98 , 115 , 38 , 132 , 38 , 128 , 13 , 130 , 8 , 131 , 130 , 18 , 18 , 18 , 133 , 13 , 14 , 16 , 13 , 16 , 10 , 134 , 134 , 134 , 135 , 19 , 133 , 136 , 24 , 18 , 18 , 27 , 29 , 137 , 138 , 138 , 138 , 138 , 138 , 138 , 138 , 138 , 18 , 19 , 16 , 21 , 84 , 60 , 112 , 139 , 50 , 21 , 19 , 140 , 121 , 123 , 8 , 18 , 125 , 10 , 108 , 141 , 99 , 142 , 143 , 107 , 110 , 10 , 14 , 110 , 85 , 8 , 131 , 130 , 144 , 20 , 4 , 145 , 146 , 147 , 148 , 130 , 8 , 131 , 149 , 19 , 19 , 18 , 18 , 18 , 72 , 115 , 19 , 35 , 98 , 149 , 142 , 143 , 8 , 131 , 130 , 144 , 4 , 8 , 131 , 135 , 135 , 47 , 138 , 138 , 150 , 19 , 18 , 19 , 14 , 151 , 135 , 152 , 138 , 138 , 138 , 153 , 19 , 138 , 135 , 24 , 42 , 19 , 19 , 71 , 24 , 133 , 8 , 18 , 13 , 80 , 19 , 18 , 139 , 20 , 112 , 112 , 91 , 21 , 154 , 155 , 16 , 156 , 20 , 157 , 155 , 158 , 158 , 158 , 158 , 159 , 19 , 157 , 160 , 158 , 158 , 158 , 158 , 158 , 158 , 29 , 161 , 162 , 162 , 162 , 163 , 164 , 164 , 164 , 158 , 125 , 8 , 8 , 14 , 165 , 10 , 99 , 62 , 99 , 8 , 8 , 14 , 166 , 167 , 112 , 144 , 4 , 8 , 131 , 144 , 8 , 168 , 144 , 60 , 146 , 147 , 148 , 169 , 147 , 170 , 171 , 170 , 69 , 85 , 172 , 173 , 172 , 144 , 4 , 174 , 18 , 18 , 72 , 175 , 38 , 174 , 8 , 8 , 144 , 4 , 8 , 131 , 168 , 144 , 144 , 4 , 135 , 8 , 16 , 176 , 79 , 80 , 81 , 177 , 71 , 177 , 138 , 19 , 19 , 88 , 89 , 138 , 138 , 138 , 138 , 94 , 19 , 19 , 135 , 137 , 8 , 18 , 101 , 175 , 91 , 60 , 112 , 178 , 123 , 158 , 19 , 179 , 60 , 180 , 158 , 20 , 158 , 76 , 62 , 180 , 158 , 155 , 181 , 156 , 156 , 157 , 20 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 157 , 71 , 125 , 125 , 8 , 105 , 99 , 14 , 108 , 99 , 62 , 166 , 80 , 182 , 80 , 112 , 67 , 112 , 91 , 112 , 168 , 144 , 144 , 4 , 144 , 4 , 144 , 168 , 130 , 169 , 147 , 170 , 171 , 170 , 69 , 85 , 172 , 173 , 172 , 147 , 170 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 92 , 183 , 184 , 185 , 101 , 184 , 168 , 144 , 186 , 187 , 138 , 186 , 187 , 168 , 144 , 144 , 4 , 4 , 168 , 168 , 144 , 47 , 8 , 19 , 16 , 100 , 101 , 102 , 138 , 94 , 138 , 138 , 138 , 13 , 105 , 138 , 133 , 188 , 24 , 138 , 138 , 18 , 137 , 13 , 138 , 178 , 112 , 79 , 162 , 85 , 155 , 155 , 164 , 60 , 71 , 158 , 164 , 158 , 21 , 21 , 179 , 179 , 180 , 60 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 180 , 94 , 125 , 99 , 108 , 80 , 13 , 110 , 80 , 85 , 130 , 112 , 91 , 4 , 168 , 168 , 144 , 4 , 147 , 170 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 92 , 183 , 184 , 185 , 101 , 184 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 107 , 8 , 16 , 189 , 101 , 13 , 16 , 189 , 4 , 168 , 190 , 62 , 191 , 190 , 62 , 4 , 168 , 168 , 144 , 4 , 4 , 168 , 135 , 47 , 138 , 19 , 118 , 13 , 16 , 192 , 125 , 138 , 13 , 135 , 24 , 42 , 19 , 19 , 18 , 18 , 16 , 100 , 155 , 10 , 164 , 76 , 94 , 162 , 162 , 193 , 162 , 164 , 164 , 193 , 193 , 193 , 193 , 193 , 193 , 193 , 164 , 164 , 164 , 155 , 113 , 155 , 158 , 13 , 110 , 8 , 112 , 130 , 4 , 4 , 168 , 171 , 170 , 172 , 172 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 107 , 8 , 16 , 189 , 101 , 13 , 16 , 189 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 194 , 13 , 19 , 16 , 13 , 143 , 19 , 16 , 4 , 187 , 21 , 195 , 187 , 38 , 4 , 4 , 168 , 4 , 135 , 138 , 138 , 138 , 19 , 177 , 8 , 125 , 138 , 19 , 19 , 138 , 138 , 138 , 19 , 16 , 14 , 158 , 158 , 132 , 158 , 8 , 110 , 4 , 170 , 172 , 172 , 184 , 184 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 194 , 13 , 19 , 16 , 13 , 143 , 19 , 16 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 8 , 142 , 143 , 8 , 19 , 143 , 8 , 8 , 19 , 62 , 42 , 62 , 4 , 13 , 80 , 138 , 125 , 8 , 8 , 138 , 138 , 196 , 19 , 155 , 149 , 110 , 172 , 172 , 184 , 184 , 16 , 189 , 16 , 189 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 8 , 142 , 143 , 8 , 19 , 143 , 8 , 8 , 19 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 21 , 38 , 138 , 101 , 125 , 125 , 8 , 175 , 158 , 174 , 184 , 184 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 13 , 125 , 138 , 186 , 187 , 16 , 189 , 16 , 189 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 138 , 122 , 190 , 62 , 19 , 16 , 19 , 16 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 140 , 187 , 158 , 8 , 19 , 8 , 19 , 8 , 8 , 8 , 8 , 8 , 8 , 161 , 62 , 8 , 8 , 158  

diff --git a/src/parser/test_parser.nit b/src/parser/test_parser.nit
index 2fbfb1a..d8222fb 100644 (file)
--- a/src/parser/test_parser.nit
+++ b/src/parser/test_parser.nit
@@ -21,8 +21,8 @@ import parser
 
 class PrintTreeVisitor
 special Visitor
 
 class PrintTreeVisitor
 special Visitor

-       attr _rank: Int
-       meth visit(n: PNode)
+       var _rank: Int
+       fun visit(n: PNode)

        do
                printn("  " * _rank, n.to_s, "\n")
                _rank = _rank + 1
        do
                printn("  " * _rank, n.to_s, "\n")
                _rank = _rank + 1

diff --git a/src/parser/xss/lexer.xss b/src/parser/xss/lexer.xss
index fccb57c..02ab651 100644 (file)
--- a/src/parser/xss/lexer.xss
+++ b/src/parser/xss/lexer.xss
@@ -22,41 +22,41 @@ $ template make_lexer()
 # It is better user with the Parser
 class Lexer
        # Last peeked token
 # It is better user with the Parser
 class Lexer
        # Last peeked token

-       attr _token: nullable Token
+       var _token: nullable Token

 
        # Lexer current state
 
        # Lexer current state

-       attr _state: Int = 0
+       var _state: Int = 0

 
        # Name of the stream (as given to tokens)
 
        # Name of the stream (as given to tokens)

-       readable attr _filename: String 
+       readable var _filename: String 

 
        # Input stream where character are read
 
        # Input stream where character are read

-       attr _stream: IStream
+       var _stream: IStream

 
        # Pushback buffer to store unread character
 
        # Pushback buffer to store unread character

-       attr _stream_buf: Buffer
+       var _stream_buf: Buffer

 
        # Number of character stored in the pushback buffer
 
        # Number of character stored in the pushback buffer

-       attr _stream_pos: Int
+       var _stream_pos: Int

 
        # Current line number in the input stream
 
        # Current line number in the input stream

-       attr _line: Int = 0
+       var _line: Int = 0

 
        # Current column in the input stream
 
        # Current column in the input stream

-       attr _pos: Int = 0
+       var _pos: Int = 0

 
        # Was the last character a cariage-return?
 
        # Was the last character a cariage-return?

-       attr _cr: Bool = false
+       var _cr: Bool = false

 
        # If the end of stream?
 
        # If the end of stream?

-       attr _eof: Bool = false
+       var _eof: Bool = false

 
        # Current working text read from the input stream
 
        # Current working text read from the input stream

-       attr _text: Buffer
+       var _text: Buffer

 
 $ foreach {lexer_data/state}
        # Constante state values
 
 $ foreach {lexer_data/state}
        # Constante state values

-       private meth state_${translate(@name,"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz")}: Int do return @id end
+       private fun state_${translate(@name,"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz")}: Int do return @id end

 $ end foreach
 
        # Create a new lexer for a stream (and a name)
 $ end foreach
 
        # Create a new lexer for a stream (and a name)

@@ -72,7 +72,7 @@ $ end foreach
        end
 
        # Give the next token (but do not consume it)
        end
 
        # Give the next token (but do not consume it)

-       meth peek: Token
+       fun peek: Token

        do
                while _token == null do
                        _token = get_token
        do
                while _token == null do
                        _token = get_token

@@ -81,7 +81,7 @@ $ end foreach
        end
 
        # Give and consume the next token
        end
 
        # Give and consume the next token

-       meth next: Token
+       fun next: Token

        do
                var result = _token
                while result == null do
        do
                var result = _token
                while result == null do

@@ -92,7 +92,7 @@ $ end foreach
        end
 
        # Get a token, or null if it is discarded
        end
 
        # Get a token, or null if it is discarded

-       private meth get_token: nullable Token
+       private fun get_token: nullable Token

        do
                var dfa_state = 0
 
        do
                var dfa_state = 0
 

@@ -217,7 +217,7 @@ $ end foreach
 
        # Read the next character.
        # The character is read from the stream of from the pushback buffer.
 
        # Read the next character.
        # The character is read from the stream of from the pushback buffer.

-       private meth get_char: Int
+       private fun get_char: Int

        do
                if _eof then
                        return -1
        do
                if _eof then
                        return -1

@@ -243,7 +243,7 @@ $ end foreach
 
        # Unread some characters.
        # Unread characters are stored in the pushback buffer.
 
        # Unread some characters.
        # Unread characters are stored in the pushback buffer.

-       private meth push_back(accept_length: Int)
+       private fun push_back(accept_length: Int)

        do
                var length = _text.length
                var i = length - 1
        do
                var length = _text.length
                var i = length - 1

@@ -255,8 +255,8 @@ $ end foreach
                end
        end
 
                end
        end
 

-       attr _goto_table: Array[Array[Array[Array[Int]]]]
-       private meth build_goto_table
+       var _goto_table: Array[Array[Array[Array[Int]]]]
+       private fun build_goto_table

        do
                _goto_table = once [
 $ foreach {lexer_data/goto_table/state}
        do
                _goto_table = once [
 $ foreach {lexer_data/goto_table/state}

@@ -277,13 +277,13 @@ $ end foreach
                ]
        end
     
                ]
        end
     

-       private meth nil_array: Array[Array[Int]]
+       private fun nil_array: Array[Array[Int]]

        do
                return once new Array[Array[Int]]
        end
 
        do
                return once new Array[Array[Int]]
        end
 

-       attr _accept_table: Array[Array[Int]]
-       private meth build_accept_table do
+       var _accept_table: Array[Array[Int]]
+       private fun build_accept_table do

                _accept_table = once [
 $ foreach {lexer_data/accept_table/state}
                        [
                _accept_table = once [
 $ foreach {lexer_data/accept_table/state}
                        [

diff --git a/src/parser/xss/nodes.xss b/src/parser/xss/nodes.xss
index 8b0d044..58b12d7 100644 (file)
--- a/src/parser/xss/nodes.xss
+++ b/src/parser/xss/nodes.xss
@@ -35,19 +35,19 @@ $ end template
 $ template make_nodes()
 redef class PNode
        # Parent of the node in the AST
 $ template make_nodes()
 redef class PNode
        # Parent of the node in the AST

-       readable writable attr _parent: nullable PNode
+       readable writable var _parent: nullable PNode

 
        # Remove a child from the AST
 
        # Remove a child from the AST

-       meth remove_child(child: PNode)
+       fun remove_child(child: PNode)

        do
                replace_child(child, null)
        end
 
        # Replace a child with an other node in the AST
        do
                replace_child(child, null)
        end
 
        # Replace a child with an other node in the AST

-       meth replace_child(old_child: PNode, new_child: nullable PNode) is abstract
+       fun replace_child(old_child: PNode, new_child: nullable PNode) is abstract

 
        # Replace itself with an other node in the AST
 
        # Replace itself with an other node in the AST

-       meth replace_with(node: PNode)
+       fun replace_with(node: PNode)

        do
                if (_parent != null) then
                        _parent.replace_child(self, node)
        do
                if (_parent != null) then
                        _parent.replace_child(self, node)

@@ -56,46 +56,46 @@ redef class PNode
 
        # Visit all nodes in order.
        # Thus, call "v.visit(e)" for each node e
 
        # Visit all nodes in order.
        # Thus, call "v.visit(e)" for each node e

-       meth visit_all(v: Visitor) is abstract
+       fun visit_all(v: Visitor) is abstract

 
        # Visit all nodes in reverse order.
        # Thus, call "v.visit(e)" for each node e starting from the last child
 
        # Visit all nodes in reverse order.
        # Thus, call "v.visit(e)" for each node e starting from the last child

-       meth visit_all_reverse(v: Visitor) is abstract
+       fun visit_all_reverse(v: Visitor) is abstract

 
        # Give a human readable location of the node.
 
        # Give a human readable location of the node.

-       meth locate: String is abstract
+       fun locate: String is abstract

 
        # Return only the line number of the node
 
        # Return only the line number of the node

-       meth line_number: Int is abstract
+       fun line_number: Int is abstract

 
        # Debug method: output a message prefixed with the location.
 
        # Debug method: output a message prefixed with the location.

-       meth printl(str: String)
+       fun printl(str: String)

        do
                print("{locate}: {str}\n")
        end
 end
 
 redef class Token
        do
                print("{locate}: {str}\n")
        end
 end
 
 redef class Token

-       redef meth visit_all(v: Visitor) do end
-       redef meth visit_all_reverse(v: Visitor) do end
-       redef meth replace_child(old_child: PNode, new_child: nullable PNode) do end
+       redef fun visit_all(v: Visitor) do end
+       redef fun visit_all_reverse(v: Visitor) do end
+       redef fun replace_child(old_child: PNode, new_child: nullable PNode) do end

 
 

-       redef meth locate: String
+       redef fun locate: String

        do
                return "{filename}:{line},{pos}"
        end
 
        do
                return "{filename}:{line},{pos}"
        end
 

-       redef meth line_number do return line
+       redef fun line_number do return line

 end
 
 redef class Prod
        # The first token of the production node
 end
 
 redef class Prod
        # The first token of the production node

-       readable writable attr _first_token: nullable Token
+       readable writable var _first_token: nullable Token

 
        # The last token of the production node
 
        # The last token of the production node

-       readable writable attr _last_token: nullable Token
+       readable writable var _last_token: nullable Token

 
 

-       redef meth locate: String
+       redef fun locate: String

        do
                if first_token == null then
                        return "????"
        do
                if first_token == null then
                        return "????"

@@ -111,7 +111,7 @@ redef class Prod
                end
        end
 
                end
        end
 

-       redef meth replace_with(n: PNode)
+       redef fun replace_with(n: PNode)

         do
                 super
                 assert n isa Prod
         do
                 super
                 assert n isa Prod

@@ -119,7 +119,7 @@ redef class Prod
                 n.last_token = last_token
         end
 
                 n.last_token = last_token
         end
 

-       redef meth line_number
+       redef fun line_number

        do
                if first_token != null then
                        return first_token.line
        do
                if first_token != null then
                        return first_token.line

@@ -134,7 +134,7 @@ class Visitor
         # Ask the visitor to visit a given node.
         # Usually automatically called by visit_all* methods.
         # Concrete visitors should redefine this method.
         # Ask the visitor to visit a given node.
         # Usually automatically called by visit_all* methods.
         # Concrete visitors should redefine this method.

-        meth visit(e: nullable PNode) is abstract
+        fun visit(e: nullable PNode) is abstract

 end
 
 $ end template
 end
 
 $ end template

diff --git a/src/parser/xss/parser.xss b/src/parser/xss/parser.xss
index 2ba5317..3ca1bcd 100644 (file)
--- a/src/parser/xss/parser.xss
+++ b/src/parser/xss/parser.xss
@@ -21,10 +21,10 @@ $ template make_parser()
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number
 # State of the parser automata as stored in the parser stack.
 private class State
        # The internal state number

-       readable writable attr _state: Int
+       readable writable var _state: Int

 
        # The node stored with the state in the stack
 
        # The node stored with the state in the stack

-       readable writable attr _nodes: nullable Object 
+       readable writable var _nodes: nullable Object 

 
        init(state: Int, nodes: nullable Object)
        do
 
        init(state: Int, nodes: nullable Object)
        do

@@ -36,13 +36,13 @@ end
 class Parser
 special ParserTable
        # Associated lexer
 class Parser
 special ParserTable
        # Associated lexer

-       attr _lexer: Lexer
+       var _lexer: Lexer

 
        # Stack of pushed states and productions
 
        # Stack of pushed states and productions

-       attr _stack: Array[State]
+       var _stack: Array[State]

 
        # Position in the stack
 
        # Position in the stack

-       attr _stack_pos: Int
+       var _stack_pos: Int

 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)
 
        # Create a new parser based on a given lexer
        init(lexer: Lexer)

@@ -56,7 +56,7 @@ special ParserTable
        end
 
        # Do a transition in the automata
        end
 
        # Do a transition in the automata

-       private meth go_to(index: Int): Int
+       private fun go_to(index: Int): Int

        do
                var state = state
                var table = _goto_table[index]
        do
                var state = state
                var table = _goto_table[index]

@@ -80,7 +80,7 @@ special ParserTable
        end
 
        # Push someting in the state stack
        end
 
        # Push someting in the state stack

-       private meth push(numstate: Int, list_node: nullable Object)
+       private fun push(numstate: Int, list_node: nullable Object)

        do
                var pos = _stack_pos + 1
                _stack_pos = pos
        do
                var pos = _stack_pos + 1
                _stack_pos = pos

@@ -94,13 +94,13 @@ special ParserTable
        end
 
        # The current state
        end
 
        # The current state

-       private meth state: Int
+       private fun state: Int

        do
                return _stack[_stack_pos].state
        end
 
        # Pop something from the stack state
        do
                return _stack[_stack_pos].state
        end
 
        # Pop something from the stack state

-       private meth pop: nullable Object
+       private fun pop: nullable Object

        do
                var res = _stack[_stack_pos].nodes
                _stack_pos = _stack_pos -1
        do
                var res = _stack[_stack_pos].nodes
                _stack_pos = _stack_pos -1

@@ -108,7 +108,7 @@ special ParserTable
        end
 
        # Build and return a full AST.
        end
 
        # Build and return a full AST.

-       meth parse: Start
+       fun parse: Start

        do
                push(0, null)
 
        do
                push(0, null)
 

@@ -166,8 +166,8 @@ special ParserTable
                abort
        end
 
                abort
        end
 

-       attr _reduce_table: Array[ReduceAction]
-       private meth build_reduce_table
+       var _reduce_table: Array[ReduceAction]
+       private fun build_reduce_table

        do
                _reduce_table = new Array[ReduceAction].with_items(
 $ foreach {rules/rule}
        do
                _reduce_table = new Array[ReduceAction].with_items(
 $ foreach {rules/rule}

@@ -180,9 +180,9 @@ end
 # Find first and last tokens of production nodes
 private class SearchTokensVisitor
 special Visitor
 # Find first and last tokens of production nodes
 private class SearchTokensVisitor
 special Visitor

-       attr _untokenned_nodes: Array[Prod]
-       attr _last_token: nullable Token = null
-       redef meth visit(n: nullable PNode)
+       var _untokenned_nodes: Array[Prod]
+       var _last_token: nullable Token = null
+       redef fun visit(n: nullable PNode)

        do
                if n == null then
                        return
        do
                if n == null then
                        return

@@ -207,13 +207,13 @@ end
 
 # Each reduca action has its own class, this one is the root of the hierarchy.
 private abstract class ReduceAction
 
 # Each reduca action has its own class, this one is the root of the hierarchy.
 private abstract class ReduceAction

-       meth action(p: Parser) is abstract
+       fun action(p: Parser) is abstract

 end
 
 $ foreach {rules/rule}
 private class ReduceAction@index
 special ReduceAction
 end
 
 $ foreach {rules/rule}
 private class ReduceAction@index
 special ReduceAction

-       redef meth action(p: Parser)
+       redef fun action(p: Parser)

        do
                                        var node_list: nullable Object = null
 $   foreach {action}
        do
                                        var node_list: nullable Object = null
 $   foreach {action}

@@ -279,8 +279,8 @@ $ end template
 $ template make_parser_tables()
 # Parser that build a full AST
 abstract class ParserTable
 $ template make_parser_tables()
 # Parser that build a full AST
 abstract class ParserTable

-       attr _action_table: Array[Array[Int]]
-       private meth build_action_table
+       var _action_table: Array[Array[Int]]
+       private fun build_action_table

        do
                _action_table = once [ 
 $ foreach {parser_data/action_table/row}
        do
                _action_table = once [ 
 $ foreach {parser_data/action_table/row}

@@ -290,7 +290,7 @@ $ end foreach
        end
 
 $ foreach {parser_data/action_table/row}
        end
 
 $ foreach {parser_data/action_table/row}

-       private meth action_table_row${position()}: Array[Int]
+       private fun action_table_row${position()}: Array[Int]

        do
                return [
 $   foreach {action}
        do
                return [
 $   foreach {action}

@@ -300,8 +300,8 @@ $   end foreach
        end
 $ end foreach
 
        end
 $ end foreach
 

-       attr _goto_table: Array[Array[Int]]
-       private meth build_goto_table
+       var _goto_table: Array[Array[Int]]
+       private fun build_goto_table

        do
                _goto_table = once [ 
 $ foreach {parser_data/goto_table/row}
        do
                _goto_table = once [ 
 $ foreach {parser_data/goto_table/row}

@@ -314,7 +314,7 @@ $ end foreach
                ]
        end
 
                ]
        end
 

-       private meth error_messages: Array[String]
+       private fun error_messages: Array[String]

        do
                return once [
 $ foreach {parser_data/error_messages/msg}
        do
                return once [
 $ foreach {parser_data/error_messages/msg}

@@ -323,7 +323,7 @@ $ end
                ]
        end
 
                ]
        end
 

-       private meth errors: Array[Int]
+       private fun errors: Array[Int]

        do
                return once [
                        [-foreach {parser_data/errors/i}-]${.} [-sep ','-] [-end-]
        do
                return once [
                        [-foreach {parser_data/errors/i}-]${.} [-sep ','-] [-end-]

diff --git a/src/parser/xss/prods.xss b/src/parser/xss/prods.xss
index cd2f9df..387fa81 100644 (file)
--- a/src/parser/xss/prods.xss
+++ b/src/parser/xss/prods.xss
@@ -28,12 +28,12 @@ class @ename
 special ${../@ename}
 $ foreach {elem}
 $   if @is_list
 special ${../@ename}
 $ foreach {elem}
 $   if @is_list

-    readable writable attr _n_@name: List[@etype] = new List[@etype]
+    readable writable var _n_@name: List[@etype] = new List[@etype]

 $   else
 $   if @modifier
 $   else
 $   if @modifier

-    readable writable attr _n_@name: nullable @etype = null
+    readable writable var _n_@name: nullable @etype = null

 $   else
 $   else

-    readable writable attr _n_@name: @etype
+    readable writable var _n_@name: @etype

 $   end
 $   end
 $ end
 $   end
 $   end
 $ end

@@ -42,8 +42,8 @@ $ end
 
 class Start
 special Prod
 
 class Start
 special Prod

-    readable writable attr _n_base: nullable $baseprod 
-    readable writable attr _n_eof: EOF 
+    readable writable var _n_base: nullable $baseprod 
+    readable writable var _n_eof: EOF 

 end
 $ end template
 
 end
 $ end template
 

@@ -54,7 +54,7 @@ redef class @ename
 $ foreach {elem}
 $   if @is_list
 $   else
 $ foreach {elem}
 $   if @is_list
 $   else

-    redef meth n_@name=(n)
+    redef fun n_@name=(n)

     do
         _n_@name = n
 $   if @modifier
     do
         _n_@name = n
 $   if @modifier

@@ -106,7 +106,7 @@ $   end
 $ end
     end
 
 $ end
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
 $ foreach {elem}
 $   if @is_list
     do
 $ foreach {elem}
 $   if @is_list

@@ -141,7 +141,7 @@ $   end
 $ end foreach
     end
 
 $ end foreach
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
 $   foreach {elem}
 $     if @is_list
     do
 $   foreach {elem}
 $     if @is_list

@@ -160,7 +160,7 @@ $     end
 $   end foreach
     end
 
 $   end foreach
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
 $   foreach {elem}
 $     if @is_list
     do
 $   foreach {elem}
 $     if @is_list

@@ -194,7 +194,7 @@ redef class Start
         _n_eof = n_eof
     end
 
         _n_eof = n_eof
     end
 

-    redef meth replace_child(old_child: PNode, new_child: nullable PNode)
+    redef fun replace_child(old_child: PNode, new_child: nullable PNode)

     do
         if _n_base == old_child then
             if new_child == null then
     do
         if _n_base == old_child then
             if new_child == null then

@@ -208,14 +208,14 @@ redef class Start
        end
     end
 
        end
     end
 

-    redef meth visit_all(v: Visitor)
+    redef fun visit_all(v: Visitor)

     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
         end
     end
 
     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
         end
     end
 

-    redef meth visit_all_reverse(v: Visitor)
+    redef fun visit_all_reverse(v: Visitor)

     do
         if _n_base != null then
             v.visit(_n_base.as(not null))
     do
         if _n_base != null then
             v.visit(_n_base.as(not null))

diff --git a/src/parser/xss/tokens.xss b/src/parser/xss/tokens.xss
index 2796cde..ae545eb 100644 (file)
--- a/src/parser/xss/tokens.xss
+++ b/src/parser/xss/tokens.xss
@@ -37,14 +37,14 @@ $ end template
 $ template make_tokens()
 
 redef class Token
 $ template make_tokens()
 
 redef class Token

-    readable writable attr _text: String 
-    readable attr _filename: String 
-    readable attr _line: Int 
-    readable attr _pos: Int 
+    readable writable var _text: String 
+    readable var _filename: String 
+    readable var _line: Int 
+    readable var _pos: Int 

     
     

-    meth parser_index: Int is abstract
+    fun parser_index: Int is abstract

 
 

-    redef meth to_s: String do
+    redef fun to_s: String do

         return "'{_text}'"
     end
 end
         return "'{_text}'"
     end
 end

@@ -52,7 +52,7 @@ end
 $ foreach {//token}
 $ if {@parser_index}    
 redef class @ename
 $ foreach {//token}
 $ if {@parser_index}    
 redef class @ename

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return @parser_index
     end
     do
        return @parser_index
     end

@@ -76,7 +76,7 @@ $ end if
 $ end foreach
 
 redef class EOF 
 $ end foreach
 
 redef class EOF 

-    redef meth parser_index: Int
+    redef fun parser_index: Int

     do
        return ${tokens/eof/@parser_index}
     end
     do
        return ${tokens/eof/@parser_index}
     end

@@ -91,7 +91,7 @@ redef class EOF
 end
 
 redef class PError
 end
 
 redef class PError

-    readable writable attr _message: String 
+    readable writable var _message: String 

     
     init init_error(fname: String, line: Int, pos: Int, message: String)
     do
     
     init init_error(fname: String, line: Int, pos: Int, message: String)
     do

diff --git a/src/syntax/control_flow.nit b/src/syntax/control_flow.nit
index bed98a0..44d1270 100644 (file)
--- a/src/syntax/control_flow.nit
+++ b/src/syntax/control_flow.nit
@@ -24,7 +24,7 @@ import syntax_base
 abstract class VariableContext
        # Look for the variable from its name
        # Return null if nothing found
 abstract class VariableContext
        # Look for the variable from its name
        # Return null if nothing found

-       meth [](s: Symbol): nullable Variable
+       fun [](s: Symbol): nullable Variable

        do
                if _dico.has_key(s) then
                        return _dico[s]
        do
                if _dico.has_key(s) then
                        return _dico[s]

@@ -34,18 +34,18 @@ abstract class VariableContext
        end
 
        # Register a new variable with its name
        end
 
        # Register a new variable with its name

-       meth add(v: Variable)
+       fun add(v: Variable)

        do
                _dico[v.name] = v
                _all_variables.add(v)
        end
 
        do
                _dico[v.name] = v
                _all_variables.add(v)
        end
 

-       meth mark_is_set(v: Variable)
+       fun mark_is_set(v: Variable)

        do
                _set_variables.add(v)
        end
 
        do
                _set_variables.add(v)
        end
 

-       meth check_is_set(n: PNode, v: Variable)
+       fun check_is_set(n: PNode, v: Variable)

        do
                if v.must_be_set and not is_set(v) then
                        _visitor.error(n, "Error: variable '{v}' is possibly unset.")
        do
                if v.must_be_set and not is_set(v) then
                        _visitor.error(n, "Error: variable '{v}' is possibly unset.")

@@ -64,7 +64,7 @@ abstract class VariableContext
 
        # The effective static type of a given variable
        # May be different from the declaration static type
 
        # The effective static type of a given variable
        # May be different from the declaration static type

-       meth stype(v: Variable): nullable MMType
+       fun stype(v: Variable): nullable MMType

        do
                if _stypes.has_key(v) then
                        return _stypes[v]
        do
                if _stypes.has_key(v) then
                        return _stypes[v]

@@ -75,28 +75,28 @@ abstract class VariableContext
 
        # Set effective static type of a given variable
        # May be different from the declaration static type
 
        # Set effective static type of a given variable
        # May be different from the declaration static type

-       meth stype=(v: Variable, t: nullable MMType)
+       fun stype=(v: Variable, t: nullable MMType)

        do
                _stypes[v] = t
        end
 
        # Variables by name (in the current context only)
        do
                _stypes[v] = t
        end
 
        # Variables by name (in the current context only)

-       attr _dico: Map[Symbol, Variable]
+       var _dico: Map[Symbol, Variable]

 
        # All variables in all contextes
 
        # All variables in all contextes

-       attr _all_variables: Set[Variable]
+       var _all_variables: Set[Variable]

 
        # Updated static type of variables
 
        # Updated static type of variables

-       attr _stypes: Map[Variable, nullable MMType] = new HashMap[Variable, nullable MMType]
+       var _stypes: Map[Variable, nullable MMType] = new HashMap[Variable, nullable MMType]

 
        # Build a new VariableContext
 
        # Build a new VariableContext

-       meth sub(node: PNode): SubVariableContext
+       fun sub(node: PNode): SubVariableContext

        do
                return new SubVariableContext.with_prev(self, node)
        end
 
        # Build a nested VariableContext with new variable information
        do
                return new SubVariableContext.with_prev(self, node)
        end
 
        # Build a nested VariableContext with new variable information

-       meth sub_with(node: PNode, v: Variable, t: MMType): SubVariableContext
+       fun sub_with(node: PNode, v: Variable, t: MMType): SubVariableContext

        do
                var ctx = sub(node)
                ctx.stype(v) = t
        do
                var ctx = sub(node)
                ctx.stype(v) = t

@@ -104,10 +104,10 @@ abstract class VariableContext
        end
 
        # The visitor of the context (used to display error)
        end
 
        # The visitor of the context (used to display error)

-       attr _visitor: AbsSyntaxVisitor
+       var _visitor: AbsSyntaxVisitor

 
        # The syntax node that introduced the context
 
        # The syntax node that introduced the context

-       readable attr _node: PNode
+       readable var _node: PNode

 
        init(visitor: AbsSyntaxVisitor, node: PNode)
        do
 
        init(visitor: AbsSyntaxVisitor, node: PNode)
        do

@@ -117,23 +117,23 @@ abstract class VariableContext
        end
 
        # Is a control flow break met? (return, break, continue)
        end
 
        # Is a control flow break met? (return, break, continue)

-       readable writable attr _unreash: Bool = false
+       readable writable var _unreash: Bool = false

 
        # Is a control flow already broken?
        # Used to avoid repeating the same error message
 
        # Is a control flow already broken?
        # Used to avoid repeating the same error message

-       readable writable attr _already_unreash: Bool = false
+       readable writable var _already_unreash: Bool = false

 
        # Set of variable that are set (assigned)
 
        # Set of variable that are set (assigned)

-       readable attr _set_variables: HashSet[Variable] = new HashSet[Variable]
+       readable var _set_variables: HashSet[Variable] = new HashSet[Variable]

 
        # Is a variable set?
 
        # Is a variable set?

-       meth is_set(v: Variable): Bool
+       fun is_set(v: Variable): Bool

        do
                return _set_variables.has(v)
        end
 
        # Merge back one flow context information
        do
                return _set_variables.has(v)
        end
 
        # Merge back one flow context information

-       meth merge(ctx: VariableContext)
+       fun merge(ctx: VariableContext)

        do
                if ctx.unreash then
                        unreash = true
        do
                if ctx.unreash then
                        unreash = true

@@ -151,7 +151,7 @@ abstract class VariableContext
        end
 
        # Merge back two alternative flow context informations
        end
 
        # Merge back two alternative flow context informations

-       meth merge2(ctx1, ctx2, basectx: VariableContext)
+       fun merge2(ctx1, ctx2, basectx: VariableContext)

        do
                if ctx1.unreash then
                        merge(ctx2)
        do
                if ctx1.unreash then
                        merge(ctx2)

@@ -180,7 +180,7 @@ abstract class VariableContext
                end
        end
 
                end
        end
 

-       redef meth to_s
+       redef fun to_s

        do
                var s = new Buffer
                s.append(node.locate)
        do
                var s = new Buffer
                s.append(node.locate)

@@ -204,9 +204,9 @@ end
 
 class SubVariableContext
 special VariableContext
 
 class SubVariableContext
 special VariableContext

-       readable attr _prev: VariableContext
+       readable var _prev: VariableContext

 
 

-       redef meth [](s)
+       redef fun [](s)

        do
                if _dico.has_key(s) then
                        return _dico[s]
        do
                if _dico.has_key(s) then
                        return _dico[s]

@@ -215,7 +215,7 @@ special VariableContext
                end
        end
 
                end
        end
 

-       redef meth stype(v)
+       redef fun stype(v)

        do
                if _stypes.has_key(v) then
                        return _stypes[v]
        do
                if _stypes.has_key(v) then
                        return _stypes[v]

@@ -231,7 +231,7 @@ special VariableContext
                _all_variables = p._all_variables
        end
 
                _all_variables = p._all_variables
        end
 

-       redef meth is_set(v)
+       redef fun is_set(v)

        do
                return _set_variables.has(v) or _prev.is_set(v)
        end
        do
                return _set_variables.has(v) or _prev.is_set(v)
        end

@@ -239,9 +239,9 @@ end
 
 redef class Variable
        # Is the variable must be set before being used ?
 
 redef class Variable
        # Is the variable must be set before being used ?

-       meth must_be_set: Bool do return false
+       fun must_be_set: Bool do return false

 end
 
 redef class VarVariable
 end
 
 redef class VarVariable

-       redef meth must_be_set do return true
+       redef fun must_be_set do return true

 end
 end

diff --git a/src/syntax/escape.nit b/src/syntax/escape.nit
index ced1bf5..dc5ec47 100644 (file)
--- a/src/syntax/escape.nit
+++ b/src/syntax/escape.nit
@@ -22,30 +22,30 @@ import syntax_base
 # Stack escapable blocks
 class EscapableContext
        # Stack of blocks
 # Stack escapable blocks
 class EscapableContext
        # Stack of blocks

-       attr _stack: Array[EscapableBlock] = new Array[EscapableBlock]
+       var _stack: Array[EscapableBlock] = new Array[EscapableBlock]

 
        # Push a new escapable block
 
        # Push a new escapable block

-       meth push(block: EscapableBlock)
+       fun push(block: EscapableBlock)

        do
                _stack.push(block)
        end
 
        # Is there no block in the stack?
        do
                _stack.push(block)
        end
 
        # Is there no block in the stack?

-       meth is_empty: Bool do return _stack.is_empty
+       fun is_empty: Bool do return _stack.is_empty

 
        # Return the current block (the last stacked)
 
        # Return the current block (the last stacked)

-       meth head: EscapableBlock
+       fun head: EscapableBlock

        do
                return _stack.last
        end
 
        # Remove the last block (the last stacked)
        do
                return _stack.last
        end
 
        # Remove the last block (the last stacked)

-       meth pop
+       fun pop

        do
                var n = _stack.pop
        end
 
        do
                var n = _stack.pop
        end
 

-       readable attr _visitor: AbsSyntaxVisitor
+       readable var _visitor: AbsSyntaxVisitor

        init (v: AbsSyntaxVisitor)
        do
                _visitor = v
        init (v: AbsSyntaxVisitor)
        do
                _visitor = v

@@ -58,18 +58,18 @@ end
 # For and while use this class. closures uses the EscapableClosure subclass.
 class EscapableBlock
        # The syntax node of the block
 # For and while use this class. closures uses the EscapableClosure subclass.
 class EscapableBlock
        # The syntax node of the block

-       readable attr _node: PNode
+       readable var _node: PNode

 
        # Is self a break closure ?
 
        # Is self a break closure ?

-       meth is_break_block: Bool do return false
+       fun is_break_block: Bool do return false

 
        # Collected expressions used in breaks.
        # null if break does not accept values.
        # break_list is used to store expressions used in break statments and perform type checks latter
 
        # Collected expressions used in breaks.
        # null if break does not accept values.
        # break_list is used to store expressions used in break statments and perform type checks latter

-       meth break_list: nullable Array[PExpr] do return null
+       fun break_list: nullable Array[PExpr] do return null

 
        # The static type required by the continue statement (if any)
 
        # The static type required by the continue statement (if any)

-       meth continue_stype: nullable MMType do return null
+       fun continue_stype: nullable MMType do return null

 
        init(node: PNode)
        do
 
        init(node: PNode)
        do

@@ -81,13 +81,13 @@ end
 class EscapableClosure
 special EscapableBlock
        # The associated closure
 class EscapableClosure
 special EscapableBlock
        # The associated closure

-       readable attr _closure: MMClosure
+       readable var _closure: MMClosure

 
 

-       redef meth is_break_block do return _closure.is_break
+       redef fun is_break_block do return _closure.is_break

 
 

-       redef readable attr _break_list: nullable Array[PExpr]
+       redef readable var _break_list: nullable Array[PExpr]

 
 

-       redef meth continue_stype do return _closure.signature.return_type
+       redef fun continue_stype do return _closure.signature.return_type

 
        init(node: PNode, closure: MMClosure, break_list: nullable Array[PExpr])
        do
 
        init(node: PNode, closure: MMClosure, break_list: nullable Array[PExpr])
        do

@@ -102,13 +102,13 @@ end
 class AEscapeExpr
 special PNode
        # The associated escapable block
 class AEscapeExpr
 special PNode
        # The associated escapable block

-       readable attr _escapable_block: nullable EscapableBlock
+       readable var _escapable_block: nullable EscapableBlock

 
        # The name of the keyword
 
        # The name of the keyword

-       meth kwname: String is abstract
+       fun kwname: String is abstract

 
        # Compute, set and return the _abelable_node value
 
        # Compute, set and return the _abelable_node value

-       meth compute_escapable_block(lctx: EscapableContext): nullable EscapableBlock
+       fun compute_escapable_block(lctx: EscapableContext): nullable EscapableBlock

        do
                var block: EscapableBlock
                if lctx.is_empty then
        do
                var block: EscapableBlock
                if lctx.is_empty then

@@ -123,11 +123,11 @@ end
 
 redef class AContinueExpr
 special AEscapeExpr
 
 redef class AContinueExpr
 special AEscapeExpr

-       redef meth kwname do return "continue"
+       redef fun kwname do return "continue"

 end
 
 redef class ABreakExpr
 special AEscapeExpr
 end
 
 redef class ABreakExpr
 special AEscapeExpr

-       redef meth kwname do return "break"
+       redef fun kwname do return "break"

 end
 
 end
 

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 064a4c0..af4d0e2 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -24,7 +24,7 @@ import syntax_base
 # Class specialization hierarchy sorter
 private class CSHSorter
 special AbstractSorter[MMLocalClass]
 # Class specialization hierarchy sorter
 private class CSHSorter
 special AbstractSorter[MMLocalClass]

-       redef meth compare(a, b)
+       redef fun compare(a, b)

        do
                return a.cshe.rank <=> b.cshe.rank
        end
        do
                return a.cshe.rank <=> b.cshe.rank
        end

@@ -35,7 +35,7 @@ end
 redef class MMSrcModule
        # Syntax analysis and MM construction for the module
        # Require that supermodules are processed
 redef class MMSrcModule
        # Syntax analysis and MM construction for the module
        # Require that supermodules are processed

-       meth do_mmbuilder(tc: ToolContext)
+       fun do_mmbuilder(tc: ToolContext)

        do
                # Import global classes
                import_global_classes
        do
                # Import global classes
                import_global_classes

@@ -123,18 +123,18 @@ end
 
 redef class MMLocalClass
        # Accept a class visitor (on class nodes)
 
 redef class MMLocalClass
        # Accept a class visitor (on class nodes)

-       private meth accept_class_visitor(v: AbsSyntaxVisitor)
+       private fun accept_class_visitor(v: AbsSyntaxVisitor)

        do
        end
 
        # Accept a class visitor (on class properties)
        do
        end
 
        # Accept a class visitor (on class properties)

-       private meth accept_properties_visitor(v: AbsSyntaxVisitor)
+       private fun accept_properties_visitor(v: AbsSyntaxVisitor)

        do
        end
 end
 
 redef class MMSrcLocalClass
        do
        end
 end
 
 redef class MMSrcLocalClass

-       redef meth accept_class_visitor(v)
+       redef fun accept_class_visitor(v)

        do
                for n in nodes do
                        v.visit(n)
        do
                for n in nodes do
                        v.visit(n)

@@ -142,7 +142,7 @@ redef class MMSrcLocalClass
        end
 
        # Accept a class visitor (on class properties)
        end
 
        # Accept a class visitor (on class properties)

-       redef meth accept_properties_visitor(v)
+       redef fun accept_properties_visitor(v)

        do
                for n in nodes do
                        v.visit(n)
        do
                for n in nodes do
                        v.visit(n)

@@ -154,7 +154,7 @@ redef class MMSrcLocalClass
        end
 
        # Introduce or inherit default constructors
        end
 
        # Introduce or inherit default constructors

-       private meth process_default_constructors(v: PropertyBuilderVisitor)
+       private fun process_default_constructors(v: PropertyBuilderVisitor)

        do
                # Is there already a constructor ?
                for gp in global_properties do
        do
                # Is there already a constructor ?
                for gp in global_properties do

@@ -231,7 +231,7 @@ redef class MMSrcLocalClass
 
        # Add a source property
        # Register it to the class and attach it to global property
 
        # Add a source property
        # Register it to the class and attach it to global property

-       private meth add_src_local_property(v: PropertyBuilderVisitor, prop: MMLocalProperty)
+       private fun add_src_local_property(v: PropertyBuilderVisitor, prop: MMLocalProperty)

        do
                var pname = prop.name
                # Check double definition in the same class
        do
                var pname = prop.name
                # Check double definition in the same class

@@ -255,14 +255,14 @@ redef class MMSrcLocalClass
 end
 
 redef class MMLocalProperty
 end
 
 redef class MMLocalProperty

-       private meth accept_property_visitor(v: AbsSyntaxVisitor)
+       private fun accept_property_visitor(v: AbsSyntaxVisitor)

        do
        end
 end
 
 redef class MMImplicitInit
        do
        end
 end
 
 redef class MMImplicitInit

-       readable attr _super_init: nullable MMLocalProperty = null
-       redef meth accept_property_visitor(v)
+       readable var _super_init: nullable MMLocalProperty = null
+       redef fun accept_property_visitor(v)

        do
                var base: nullable MMLocalProperty = null
                for p in super_inits do
        do
                var base: nullable MMLocalProperty = null
                for p in super_inits do

@@ -298,8 +298,8 @@ end
 class MMSrcAncestor
 special MMAncestor
        # The related AST node
 class MMSrcAncestor
 special MMAncestor
        # The related AST node

-       readable attr _node: ASuperclass
-       redef readable attr _local_class: MMLocalClass
+       readable var _node: ASuperclass
+       redef readable var _local_class: MMLocalClass

 
        init(n: ASuperclass, c: MMLocalClass)
        do
 
        init(n: ASuperclass, c: MMLocalClass)
        do

@@ -316,12 +316,12 @@ end
 private class ClassBuilderVisitor
 special AbsSyntaxVisitor
        # Current class arity
 private class ClassBuilderVisitor
 special AbsSyntaxVisitor
        # Current class arity

-       readable writable attr _local_class_arity: Int = 0
+       readable writable var _local_class_arity: Int = 0

 
        # Current class formal parameters
 
        # Current class formal parameters

-       readable writable attr _formals: nullable Map[Symbol, MMTypeFormalParameter]
+       readable writable var _formals: nullable Map[Symbol, MMTypeFormalParameter]

 
 

-       redef meth visit(n) do n.accept_class_builder(self)
+       redef fun visit(n) do n.accept_class_builder(self)

        init(tc, m) do super
 end
 
        init(tc, m) do super
 end
 

@@ -329,7 +329,7 @@ end
 # * Build ancertors (with only class informations not the type one)
 private class ClassSpecializationBuilderVisitor
 special AbsSyntaxVisitor
 # * Build ancertors (with only class informations not the type one)
 private class ClassSpecializationBuilderVisitor
 special AbsSyntaxVisitor

-       redef meth visit(n) do n.accept_class_specialization_builder(self)
+       redef fun visit(n) do n.accept_class_specialization_builder(self)

        init(tc, m) do super
 end
 
        init(tc, m) do super
 end
 

@@ -337,7 +337,7 @@ end
 # * Compute types in ancestors
 private class ClassAncestorBuilder
 special AbsSyntaxVisitor
 # * Compute types in ancestors
 private class ClassAncestorBuilder
 special AbsSyntaxVisitor

-       redef meth visit(n) do n.accept_class_ancestor_builder(self)
+       redef fun visit(n) do n.accept_class_ancestor_builder(self)

        init(tc, m) do super
 end
 
        init(tc, m) do super
 end
 

@@ -345,7 +345,7 @@ end
 # * Checks classes in regard to superclasses
 private class ClassVerifierVisitor
 special AbsSyntaxVisitor
 # * Checks classes in regard to superclasses
 private class ClassVerifierVisitor
 special AbsSyntaxVisitor

-       redef meth visit(n) do n.accept_class_verifier(self)
+       redef fun visit(n) do n.accept_class_verifier(self)

        init(tc, m) do super
 end
 
        init(tc, m) do super
 end
 

@@ -356,7 +356,7 @@ end
 # * Attach bound to formal types
 private class PropertyBuilderVisitor
 special AbsSyntaxVisitor
 # * Attach bound to formal types
 private class PropertyBuilderVisitor
 special AbsSyntaxVisitor

-       redef meth visit(n) do n.accept_property_builder(self)
+       redef fun visit(n) do n.accept_property_builder(self)

        init(tc, m) do super
 end
 
        init(tc, m) do super
 end
 

@@ -366,9 +366,9 @@ private class PropertyVerifierVisitor
 special AbsSyntaxVisitor
 
        # The signature currently build
 special AbsSyntaxVisitor
 
        # The signature currently build

-       readable writable attr _signature_builder: SignatureBuilder
+       readable writable var _signature_builder: SignatureBuilder

 
 

-       redef meth visit(n) do n.accept_property_verifier(self)
+       redef fun visit(n) do n.accept_property_verifier(self)

 
        init(tc, m)
        do
 
        init(tc, m)
        do

@@ -380,35 +380,35 @@ end
 # Information about a signature currently build
 private class SignatureBuilder
        # Current visited parameter types
 # Information about a signature currently build
 private class SignatureBuilder
        # Current visited parameter types

-       readable writable attr _params: Array[PParam] = new Array[PParam]
+       readable writable var _params: Array[PParam] = new Array[PParam]

        
        # Visited parameters without type information added
        
        # Visited parameters without type information added

-       readable writable attr _untyped_params: Array[PParam] = new Array[PParam]
+       readable writable var _untyped_params: Array[PParam] = new Array[PParam]

 
        # Position of the current star parameter
 
        # Position of the current star parameter

-       readable writable attr _vararg_rank: Int = -1
+       readable writable var _vararg_rank: Int = -1

 
        # Current closure declarations
 
        # Current closure declarations

-       readable writable attr _closure_decls: Array[AClosureDecl] = new Array[AClosureDecl]
+       readable writable var _closure_decls: Array[AClosureDecl] = new Array[AClosureDecl]

 
        # Current signature
 
        # Current signature

-       readable writable attr _signature: nullable MMSignature = null 
+       readable writable var _signature: nullable MMSignature = null 

 end
 
 ###############################################################################
 
 redef class PNode
 end
 
 ###############################################################################
 
 redef class PNode

-       private meth accept_class_builder(v: ClassBuilderVisitor) do accept_abs_syntax_visitor(v)
-       private meth accept_class_specialization_builder(v: ClassSpecializationBuilderVisitor) do accept_abs_syntax_visitor(v)
-       private meth accept_class_ancestor_builder(v: ClassAncestorBuilder) do accept_abs_syntax_visitor(v)
-       private meth accept_class_verifier(v: ClassVerifierVisitor) do accept_abs_syntax_visitor(v)
-       private meth accept_property_builder(v: PropertyBuilderVisitor) do accept_abs_syntax_visitor(v)
-       private meth accept_property_verifier(v: PropertyVerifierVisitor) do accept_abs_syntax_visitor(v)
+       private fun accept_class_builder(v: ClassBuilderVisitor) do accept_abs_syntax_visitor(v)
+       private fun accept_class_specialization_builder(v: ClassSpecializationBuilderVisitor) do accept_abs_syntax_visitor(v)
+       private fun accept_class_ancestor_builder(v: ClassAncestorBuilder) do accept_abs_syntax_visitor(v)
+       private fun accept_class_verifier(v: ClassVerifierVisitor) do accept_abs_syntax_visitor(v)
+       private fun accept_property_builder(v: PropertyBuilderVisitor) do accept_abs_syntax_visitor(v)
+       private fun accept_property_verifier(v: PropertyVerifierVisitor) do accept_abs_syntax_visitor(v)

 end
 
 redef class AModule
        # Import supermodules and compute visibility
 end
 
 redef class AModule
        # Import supermodules and compute visibility

-       meth import_super_modules(tc: ToolContext, mod: MMSrcModule)
+       fun import_super_modules(tc: ToolContext, mod: MMSrcModule)

        do
                # Import super-modules
                var module_names_to_import = new Array[Symbol]
        do
                # Import super-modules
                var module_names_to_import = new Array[Symbol]

@@ -444,7 +444,7 @@ redef class AModule
 end
 
 redef class APackagedecl
 end
 
 redef class APackagedecl

-       redef meth accept_class_builder(v)
+       redef fun accept_class_builder(v)

        do
                if n_id.to_symbol != v.module.name then
                        v.error(n_id, "Error: Package name missmatch between {v.module.name} and {n_id.to_symbol}")
        do
                if n_id.to_symbol != v.module.name then
                        v.error(n_id, "Error: Package name missmatch between {v.module.name} and {n_id.to_symbol}")

@@ -454,23 +454,23 @@ end
 
 redef class PImport
        # Imported module name (or null)
 
 redef class PImport
        # Imported module name (or null)

-       meth module_name: nullable Symbol is abstract
+       fun module_name: nullable Symbol is abstract

 
        # Visibility level (intrude/public/private)
 
        # Visibility level (intrude/public/private)

-       meth visibility_level: Int is abstract
+       fun visibility_level: Int is abstract

 end
 redef class AImport
 end
 redef class AImport

-       redef meth module_name
+       redef fun module_name

        do
                return n_id.to_symbol
        end
        do
                return n_id.to_symbol
        end

-       redef meth visibility_level
+       redef fun visibility_level

        do
                return n_visibility.level
        end
 end
 redef class ANoImport
        do
                return n_visibility.level
        end
 end
 redef class ANoImport

-       redef meth module_name
+       redef fun module_name

        do
                return null
        end
        do
                return null
        end

@@ -478,36 +478,36 @@ end
 
 redef class PVisibility
        # Visibility level
 
 redef class PVisibility
        # Visibility level

-       meth level: Int is abstract
+       fun level: Int is abstract

 end
 redef class APublicVisibility
 end
 redef class APublicVisibility

-       redef meth level do return 1
+       redef fun level do return 1

 end
 redef class AProtectedVisibility
 end
 redef class AProtectedVisibility

-       redef meth level do return 2
+       redef fun level do return 2

 end
 redef class APrivateVisibility
 end
 redef class APrivateVisibility

-       redef meth level do return 3
+       redef fun level do return 3

 end
 redef class AIntrudeVisibility
 end
 redef class AIntrudeVisibility

-       redef meth level do return 0
+       redef fun level do return 0

 end
 
 
 redef class PClassdef
 end
 
 
 redef class PClassdef

-       redef meth local_class: MMSrcLocalClass do return _local_class.as(not null)
-       attr _local_class: nullable MMSrcLocalClass
+       redef fun local_class: MMSrcLocalClass do return _local_class.as(not null)
+       var _local_class: nullable MMSrcLocalClass

 
        # Name of the class
 
        # Name of the class

-       meth name: Symbol is abstract
+       fun name: Symbol is abstract

 
        # Number of formal parameters
 
        # Number of formal parameters

-       meth arity: Int do return 0
+       fun arity: Int do return 0

 
        # Visibility of the class
 
        # Visibility of the class

-       meth visibility_level: Int do return 1
+       fun visibility_level: Int do return 1

 
 

-       redef meth accept_class_builder(v)
+       redef fun accept_class_builder(v)

        do
                var local_class: MMSrcLocalClass
                var mod = v.module
        do
                var local_class: MMSrcLocalClass
                var mod = v.module

@@ -541,7 +541,7 @@ redef class PClassdef
                v.formals = null
        end
 
                v.formals = null
        end
 

-       redef meth accept_abs_syntax_visitor(v)
+       redef fun accept_abs_syntax_visitor(v)

        do
                v.local_class = _local_class
                super
        do
                v.local_class = _local_class
                super

@@ -550,31 +550,31 @@ redef class PClassdef
 end
 
 redef class PClasskind
 end
 
 redef class PClasskind

-       meth is_interface: Bool do return false
-       meth is_universal: Bool do return false
-       meth is_abstract: Bool do return false
+       fun is_interface: Bool do return false
+       fun is_universal: Bool do return false
+       fun is_abstract: Bool do return false

 end
 
 redef class AInterfaceClasskind
 end
 
 redef class AInterfaceClasskind

-       redef meth is_interface do return true
+       redef fun is_interface do return true

 end
 redef class AUniversalClasskind
 end
 redef class AUniversalClasskind

-       redef meth is_universal do return true
+       redef fun is_universal do return true

 end
 redef class AAbstractClasskind
 end
 redef class AAbstractClasskind

-       redef meth is_abstract do return true
+       redef fun is_abstract do return true

 end
 
 redef class AClassdef
 end
 
 redef class AClassdef

-       redef meth name
+       redef fun name

        do
                return n_id.to_symbol
        end
        do
                return n_id.to_symbol
        end

-       redef meth arity
+       redef fun arity

        do
                return n_formaldefs.length
        end
        do
                return n_formaldefs.length
        end

-       redef meth accept_class_verifier(v)
+       redef fun accept_class_verifier(v)

        do
                super
                var glob = _local_class.global
        do
                super
                var glob = _local_class.global

@@ -631,21 +631,21 @@ redef class AClassdef
                end
        end
 
                end
        end
 

-       redef meth visibility_level
+       redef fun visibility_level

        do
                return n_visibility.level
        end
 end
 
 redef class AMainClassdef
        do
                return n_visibility.level
        end
 end
 
 redef class AMainClassdef

-       redef meth name
+       redef fun name

        do
                return once "Sys".to_symbol
        end
 end
 
 redef class ATopClassdef
        do
                return once "Sys".to_symbol
        end
 end
 
 redef class ATopClassdef

-       redef meth name
+       redef fun name

        do
                return once "Object".to_symbol
        end
        do
                return once "Object".to_symbol
        end

@@ -654,7 +654,7 @@ end
 class MMSrcTypeFormalParameter
 special MMTypeFormalParameter
        # The associated node
 class MMSrcTypeFormalParameter
 special MMTypeFormalParameter
        # The associated node

-       readable attr _node: AFormaldef 
+       readable var _node: AFormaldef 

 
        init(name: Symbol, pos: Int, local_class: MMLocalClass, n: AFormaldef)
        do
 
        init(name: Symbol, pos: Int, local_class: MMLocalClass, n: AFormaldef)
        do

@@ -665,9 +665,9 @@ end
 
 redef class AFormaldef
        # The associated formal generic parameter (MM entity)
 
 redef class AFormaldef
        # The associated formal generic parameter (MM entity)

-       attr _formal: nullable MMSrcTypeFormalParameter
+       var _formal: nullable MMSrcTypeFormalParameter

 
 

-       redef meth accept_class_builder(v)
+       redef fun accept_class_builder(v)

        do
                var name = n_id.to_symbol
                var formal_type = new MMSrcTypeFormalParameter(name, v.local_class_arity, v.local_class, self)
        do
                var name = n_id.to_symbol
                var formal_type = new MMSrcTypeFormalParameter(name, v.local_class_arity, v.local_class, self)

@@ -678,7 +678,7 @@ redef class AFormaldef
                super
        end
 
                super
        end
 

-       redef meth accept_class_verifier(v)
+       redef fun accept_class_verifier(v)

        do
                super
                var c = v.local_class
        do
                super
                var c = v.local_class

@@ -704,9 +704,9 @@ redef class AFormaldef
 end
 
 redef class ASuperclass
 end
 
 redef class ASuperclass

-       readable attr _ancestor: nullable MMSrcAncestor
+       readable var _ancestor: nullable MMSrcAncestor

 
 

-       redef meth accept_class_specialization_builder(v)
+       redef fun accept_class_specialization_builder(v)

        do
                super
                var c = n_type.get_local_class(v)
        do
                super
                var c = n_type.get_local_class(v)

@@ -716,14 +716,14 @@ redef class ASuperclass
                v.local_class.add_direct_parent(ancestor)
        end
 
                v.local_class.add_direct_parent(ancestor)
        end
 

-       redef meth accept_class_ancestor_builder(v)
+       redef fun accept_class_ancestor_builder(v)

        do
                super
                _ancestor.stype = n_type.get_unchecked_stype(v)
                _ancestor.inheriter = v.local_class.get_type
        end
 
        do
                super
                _ancestor.stype = n_type.get_unchecked_stype(v)
                _ancestor.inheriter = v.local_class.get_type
        end
 

-       redef meth accept_class_verifier(v)
+       redef fun accept_class_verifier(v)

        do
                super
                n_type.check_conform(v)
        do
                super
                n_type.check_conform(v)

@@ -737,7 +737,7 @@ redef class PPropdef
        # * Check redef errors.
        # * Check forbiden attribute definitions.
        # * Check signature conformance.
        # * Check redef errors.
        # * Check forbiden attribute definitions.
        # * Check signature conformance.

-       private meth process_and_check(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
+       private fun process_and_check(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)

        do
                if prop.global.intro == prop then
                        do_and_check_intro(v, prop, has_redef, visibility_level)
        do
                if prop.global.intro == prop then
                        do_and_check_intro(v, prop, has_redef, visibility_level)

@@ -747,7 +747,7 @@ redef class PPropdef
        end
 
        # The part of process_and_check when prop is an introduction
        end
 
        # The part of process_and_check when prop is an introduction

-       private meth do_and_check_intro(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
+       private fun do_and_check_intro(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)

        do
                var glob = prop.global
                var gbc = prop.local_class.global
        do
                var glob = prop.global
                var gbc = prop.local_class.global

@@ -790,7 +790,7 @@ redef class PPropdef
                end
        end
 
                end
        end
 

-       private meth inherit_signature(v: PropertyVerifierVisitor, prop: MMLocalProperty, supers: Array[MMLocalProperty])
+       private fun inherit_signature(v: PropertyVerifierVisitor, prop: MMLocalProperty, supers: Array[MMLocalProperty])

        do
                var s = prop.signature
                for ip in supers do
        do
                var s = prop.signature
                for ip in supers do

@@ -817,7 +817,7 @@ redef class PPropdef
        end
 
        # The part of process_and_check when prop is a redefinition
        end
 
        # The part of process_and_check when prop is a redefinition

-       private meth do_and_check_redef(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)
+       private fun do_and_check_redef(v: PropertyVerifierVisitor, prop: MMLocalProperty, has_redef: Bool, visibility_level: Int)

        do
                var is_init = self isa AConcreteInitPropdef
                var glob = prop.global
        do
                var is_init = self isa AConcreteInitPropdef
                var glob = prop.global

@@ -904,12 +904,12 @@ redef class PPropdef
 end
 
 redef class AAttrPropdef
 end
 
 redef class AAttrPropdef

-       redef readable attr _readmethod: nullable MMSrcMethod
-       redef readable attr _writemethod: nullable MMSrcMethod
-       attr _prop: nullable MMSrcAttribute
-       redef meth prop do return _prop.as(not null)
+       redef readable var _readmethod: nullable MMSrcMethod
+       redef readable var _writemethod: nullable MMSrcMethod
+       var _prop: nullable MMSrcAttribute
+       redef fun prop do return _prop.as(not null)

 
 

-       redef meth accept_property_builder(v)
+       redef fun accept_property_builder(v)

        do
                super
                var name = n_id.to_symbol
        do
                super
                var name = n_id.to_symbol

@@ -932,7 +932,7 @@ redef class AAttrPropdef
                end
        end
        
                end
        end
        

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                super
                var t: MMType
        do
                super
                var t: MMType

@@ -963,7 +963,7 @@ redef class AAttrPropdef
                end
        end
 
                end
        end
 

-       redef meth accept_abs_syntax_visitor(v)
+       redef fun accept_abs_syntax_visitor(v)

        do
                v.local_property = _prop
                super
        do
                v.local_property = _prop
                super

@@ -973,12 +973,12 @@ end
 
 redef class AMethPropdef
        # Name of the method
 
 redef class AMethPropdef
        # Name of the method

-       readable attr _name: nullable Symbol 
+       readable var _name: nullable Symbol 

 
 

-       attr _method: nullable MMMethSrcMethod
-       redef meth method do return _method.as(not null)
+       var _method: nullable MMMethSrcMethod
+       redef fun method do return _method.as(not null)

 
 

-       redef meth accept_property_builder(v)
+       redef fun accept_property_builder(v)

        do
                super
                var name: Symbol
        do
                super
                var name: Symbol

@@ -1004,7 +1004,7 @@ redef class AMethPropdef
                v.local_class.add_src_local_property(v, prop)
        end
 
                v.local_class.add_src_local_property(v, prop)
        end
 

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                v.signature_builder = new SignatureBuilder
                super
        do
                v.signature_builder = new SignatureBuilder
                super

@@ -1022,7 +1022,7 @@ redef class AMethPropdef
                if n_signature != null then n_signature.check_visibility(v, method)
        end
 
                if n_signature != null then n_signature.check_visibility(v, method)
        end
 

-       redef meth accept_abs_syntax_visitor(v)
+       redef fun accept_abs_syntax_visitor(v)

        do
                v.local_property = _method
                super
        do
                v.local_property = _method
                super

@@ -1031,7 +1031,7 @@ redef class AMethPropdef
 end
 
 redef class AMainMethPropdef
 end
 
 redef class AMainMethPropdef

-       redef meth process_and_check(v, prop, has_redef, visibility_level)
+       redef fun process_and_check(v, prop, has_redef, visibility_level)

        do
                prop.global.visibility_level = visibility_level
                prop.signature = new MMSignature(new Array[MMType], null, v.local_class.get_type)
        do
                prop.global.visibility_level = visibility_level
                prop.signature = new MMSignature(new Array[MMType], null, v.local_class.get_type)

@@ -1040,10 +1040,10 @@ redef class AMainMethPropdef
 end
 
 redef class ATypePropdef
 end
 
 redef class ATypePropdef

-       redef meth prop do return _prop.as(not null)
-       attr _prop: nullable MMSrcTypeProperty
+       redef fun prop do return _prop.as(not null)
+       var _prop: nullable MMSrcTypeProperty

 
 

-       redef meth accept_property_builder(v)
+       redef fun accept_property_builder(v)

        do
                super
                var name = n_id.to_symbol
        do
                super
                var name = n_id.to_symbol

@@ -1052,7 +1052,7 @@ redef class ATypePropdef
                v.local_class.add_src_local_property(v, prop)
        end
        
                v.local_class.add_src_local_property(v, prop)
        end
        

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                super
                var signature = new MMSignature(new Array[MMType], n_type.get_stype(v), v.local_class.get_type)
        do
                super
                var signature = new MMSignature(new Array[MMType], n_type.get_stype(v), v.local_class.get_type)

@@ -1061,7 +1061,7 @@ redef class ATypePropdef
                process_and_check(v, prop, n_kwredef != null, visibility_level)
        end
        
                process_and_check(v, prop, n_kwredef != null, visibility_level)
        end
        

-       redef meth accept_abs_syntax_visitor(v)
+       redef fun accept_abs_syntax_visitor(v)

        do
                v.local_property = _prop
                super
        do
                v.local_property = _prop
                super

@@ -1072,8 +1072,8 @@ end
 # Visitor used to build a full method name from multiple tokens
 private class MethidAccumulator
 special Visitor
 # Visitor used to build a full method name from multiple tokens
 private class MethidAccumulator
 special Visitor

-       readable attr _name: Buffer = new Buffer
-       redef meth visit(n)
+       readable var _name: Buffer = new Buffer
+       redef fun visit(n)

        do
                if n isa Token then
                        _name.append(n.text)
        do
                if n isa Token then
                        _name.append(n.text)

@@ -1085,9 +1085,9 @@ end
 
 redef class PMethid
        # Method name
 
 redef class PMethid
        # Method name

-       readable attr _name: nullable Symbol 
+       readable var _name: nullable Symbol 

 
 

-       redef meth accept_property_builder(v)
+       redef fun accept_property_builder(v)

        do
                var accumulator = new MethidAccumulator
                accumulator.visit(self)
        do
                var accumulator = new MethidAccumulator
                accumulator.visit(self)

@@ -1098,11 +1098,11 @@ end
 
 redef class PSignature
        # Check that visibilities of types in the signature are compatible with the visibility of the property.
 
 redef class PSignature
        # Check that visibilities of types in the signature are compatible with the visibility of the property.

-       meth check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract
+       fun check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract

 end
 
 redef class ASignature
 end
 
 redef class ASignature

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                super
                if not v.signature_builder.untyped_params.is_empty then
        do
                super
                if not v.signature_builder.untyped_params.is_empty then

@@ -1129,7 +1129,7 @@ redef class ASignature
                end
        end
 
                end
        end
 

-       redef meth check_visibility(v, p)
+       redef fun check_visibility(v, p)

        do
                if p.global.visibility_level >= 3 then return
                for n in n_params do
        do
                if p.global.visibility_level >= 3 then return
                for n in n_params do

@@ -1140,15 +1140,15 @@ redef class ASignature
 end
 
 redef class PParam
 end
 
 redef class PParam

-       redef readable attr _position: Int = 0
+       redef readable var _position: Int = 0

 
 

-       redef meth variable: ParamVariable do return _variable.as(not null)
-       attr _variable: nullable ParamVariable
+       redef fun variable: ParamVariable do return _variable.as(not null)
+       var _variable: nullable ParamVariable

 
        # The type of the parameter in signature
 
        # The type of the parameter in signature

-       readable writable attr _stype: nullable MMType
+       readable writable var _stype: nullable MMType

 
 

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                super
                _position = v.signature_builder.params.length
        do
                super
                _position = v.signature_builder.params.length

@@ -1173,18 +1173,18 @@ redef class PParam
                end
        end
 
                end
        end
 

-       meth is_vararg: Bool is abstract
+       fun is_vararg: Bool is abstract

 end
 
 redef class AParam
 end
 
 redef class AParam

-       redef meth is_vararg do return n_dotdotdot != null
+       redef fun is_vararg do return n_dotdotdot != null

 end
 
 redef class AClosureDecl
 end
 
 redef class AClosureDecl

-       redef meth variable: ClosureVariable do return _variable.as(not null)
-       attr _variable: nullable ClosureVariable
+       redef fun variable: ClosureVariable do return _variable.as(not null)
+       var _variable: nullable ClosureVariable

 
 

-       redef meth accept_property_verifier(v)
+       redef fun accept_property_verifier(v)

        do
                var old_signature_builder = v.signature_builder
                v.signature_builder = new SignatureBuilder
        do
                var old_signature_builder = v.signature_builder
                v.signature_builder = new SignatureBuilder

@@ -1211,11 +1211,11 @@ end
 
 redef class PType
        # Check that visibilities of types in the signature are compatible with the visibility of the property.
 
 redef class PType
        # Check that visibilities of types in the signature are compatible with the visibility of the property.

-       private meth check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract
+       private fun check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract

 end
 
 redef class AType
 end
 
 redef class AType

-       redef meth check_visibility(v, p)
+       redef fun check_visibility(v, p)

        do
                if p.global.visibility_level >= 3 then return
                var t = get_stype(v)
        do
                if p.global.visibility_level >= 3 then return
                var t = get_stype(v)

@@ -1231,7 +1231,7 @@ redef class AType
 end
 
 redef class PExpr
 end
 
 redef class PExpr

-       redef meth accept_class_builder(v) do end
-       redef meth accept_property_builder(v) do end
-       redef meth accept_property_verifier(v) do end
+       redef fun accept_class_builder(v) do end
+       redef fun accept_property_builder(v) do end
+       redef fun accept_property_verifier(v) do end

 end
 end

diff --git a/src/syntax/syntax.nit b/src/syntax/syntax.nit
index 8ce3d94..72989bd 100644 (file)
--- a/src/syntax/syntax.nit
+++ b/src/syntax/syntax.nit
@@ -27,9 +27,9 @@ class SrcModuleLoader
 special ModuleLoader
        redef type MODULE: MMSrcModule
 
 special ModuleLoader
        redef type MODULE: MMSrcModule
 

-       redef meth file_type do return "nit"
+       redef fun file_type do return "nit"

 
 

-       redef meth parse_file(context, file, filename, name, dir)
+       redef fun parse_file(context, file, filename, name, dir)

        do
                var lexer = new Lexer(file, filename)
                var parser = new Parser(lexer)
        do
                var lexer = new Lexer(file, filename)
                var parser = new Parser(lexer)

@@ -46,7 +46,7 @@ special ModuleLoader
                return module
        end
 
                return module
        end
 

-       redef meth process_metamodel(context, module)
+       redef fun process_metamodel(context, module)

        do
                module.process_supermodules(context)
                module.process_syntax(context)
        do
                module.process_supermodules(context)
                module.process_syntax(context)

@@ -57,14 +57,14 @@ end
 
 redef class MMSrcModule
        # Loading and syntax analysis of super modules
 
 redef class MMSrcModule
        # Loading and syntax analysis of super modules

-       private meth process_supermodules(tc: ToolContext)
+       private fun process_supermodules(tc: ToolContext)

        do
                node.import_super_modules(tc, self)
        end
 
        # Syntax analysis and MM construction for the module
        # Require than supermodules are processed
        do
                node.import_super_modules(tc, self)
        end
 
        # Syntax analysis and MM construction for the module
        # Require than supermodules are processed

-       private meth process_syntax(tc: ToolContext)
+       private fun process_syntax(tc: ToolContext)

        do
                do_mmbuilder(tc)
                if tc.error_count > 0 then exit(1)
        do
                do_mmbuilder(tc)
                if tc.error_count > 0 then exit(1)

diff --git a/src/syntax/syntax_base.nit b/src/syntax/syntax_base.nit
index 34b096d..cb3b15e 100644 (file)
--- a/src/syntax/syntax_base.nit
+++ b/src/syntax/syntax_base.nit
@@ -24,10 +24,10 @@ import mmloader
 class MMSrcModule
 special MMModule
        # The related AST node
 class MMSrcModule
 special MMModule
        # The related AST node

-       readable attr _node: AModule
+       readable var _node: AModule

 
        # Concrete NIT source local classs by name
 
        # Concrete NIT source local classs by name

-       readable attr _src_local_classes: Map[Symbol, MMSrcLocalClass]
+       readable var _src_local_classes: Map[Symbol, MMSrcLocalClass]

 
        init(c: MMContext, source: AModule, dir: MMDirectory, name: Symbol, filename: String)
        do
 
        init(c: MMContext, source: AModule, dir: MMDirectory, name: Symbol, filename: String)
        do

@@ -39,7 +39,7 @@ end
 
 redef class MMGlobalClass
        # Check that a module can access a class
 
 redef class MMGlobalClass
        # Check that a module can access a class

-       meth check_visibility(v: AbsSyntaxVisitor, n: PNode, cm: MMSrcModule): Bool do
+       fun check_visibility(v: AbsSyntaxVisitor, n: PNode, cm: MMSrcModule): Bool do

                var pm = intro.module
                assert pm isa MMSrcModule
                var vpm = cm.visibility_for(pm)
                var pm = intro.module
                assert pm isa MMSrcModule
                var vpm = cm.visibility_for(pm)

@@ -60,13 +60,13 @@ end
 class MMSrcLocalClass
 special MMConcreteClass
        # The related AST nodes
 class MMSrcLocalClass
 special MMConcreteClass
        # The related AST nodes

-       readable attr _nodes: Array[PClassdef]
+       readable var _nodes: Array[PClassdef]

 
        # Concrete NIT source generic formal parameter by name
 
        # Concrete NIT source generic formal parameter by name

-       readable attr _formal_dict: Map[Symbol, MMTypeFormalParameter] = new HashMap[Symbol, MMTypeFormalParameter]
+       readable var _formal_dict: Map[Symbol, MMTypeFormalParameter] = new HashMap[Symbol, MMTypeFormalParameter]

 
        # Concrete NIT source properties by name
 
        # Concrete NIT source properties by name

-       readable attr _src_local_properties: Map[Symbol, MMLocalProperty]
+       readable var _src_local_properties: Map[Symbol, MMLocalProperty]

 
        init(mod: MMSrcModule, n: Symbol, cla: PClassdef, a: Int)
        do
 
        init(mod: MMSrcModule, n: Symbol, cla: PClassdef, a: Int)
        do

@@ -78,7 +78,7 @@ end
 
 redef class MMGlobalProperty
        # Check that a module can access a property
 
 redef class MMGlobalProperty
        # Check that a module can access a property

-       meth check_visibility(v: AbsSyntaxVisitor, n: PNode, cm: MMSrcModule, allows_protected: Bool): Bool do
+       fun check_visibility(v: AbsSyntaxVisitor, n: PNode, cm: MMSrcModule, allows_protected: Bool): Bool do

                var pm = local_class.module
                assert pm isa MMSrcModule
                var vpm = cm.visibility_for(pm)
                var pm = local_class.module
                assert pm isa MMSrcModule
                var vpm = cm.visibility_for(pm)

@@ -101,16 +101,16 @@ end
 
 redef class MMLocalProperty
        # The attached node (if any)
 
 redef class MMLocalProperty
        # The attached node (if any)

-       meth node: nullable PNode do return null
+       fun node: nullable PNode do return null

 
        # Is the concrete method defined as init
 
        # Is the concrete method defined as init

-       meth is_init: Bool do return false
+       fun is_init: Bool do return false

 end
 
 # Concrete NIT source attribute
 class MMSrcAttribute
 special MMAttribute
 end
 
 # Concrete NIT source attribute
 class MMSrcAttribute
 special MMAttribute

-       redef readable attr _node: AAttrPropdef
+       redef readable var _node: AAttrPropdef

        init(name: Symbol, cla: MMLocalClass, n: AAttrPropdef)
        do
                super(name, cla)
        init(name: Symbol, cla: MMLocalClass, n: AAttrPropdef)
        do
                super(name, cla)

@@ -126,7 +126,7 @@ end
 # Concrete NIT source method for an automatic accesor
 class MMAttrImplementationMethod
 special MMSrcMethod
 # Concrete NIT source method for an automatic accesor
 class MMAttrImplementationMethod
 special MMSrcMethod

-       redef readable attr _node: AAttrPropdef
+       redef readable var _node: AAttrPropdef

        init(name: Symbol, cla: MMLocalClass, n: AAttrPropdef)
        do
                super(name, cla)
        init(name: Symbol, cla: MMLocalClass, n: AAttrPropdef)
        do
                super(name, cla)

@@ -155,8 +155,8 @@ end
 # Concrete NIT source method for an explicit method
 class MMMethSrcMethod
 special MMSrcMethod
 # Concrete NIT source method for an explicit method
 class MMMethSrcMethod
 special MMSrcMethod

-       redef meth is_init do return _node isa AConcreteInitPropdef
-       redef readable attr _node: nullable AMethPropdef
+       redef fun is_init do return _node isa AConcreteInitPropdef
+       redef readable var _node: nullable AMethPropdef

        init(name: Symbol, cla: MMLocalClass, n: nullable AMethPropdef)
        do
                super(name, cla)
        init(name: Symbol, cla: MMLocalClass, n: nullable AMethPropdef)
        do
                super(name, cla)

@@ -168,7 +168,7 @@ end
 class MMSrcTypeProperty
 special MMLocalProperty
 special MMTypeProperty
 class MMSrcTypeProperty
 special MMLocalProperty
 special MMTypeProperty

-       redef readable attr _node: ATypePropdef
+       redef readable var _node: ATypePropdef

        init(name: Symbol, cla: MMLocalClass, n: ATypePropdef)
        do
                super(name, cla)
        init(name: Symbol, cla: MMLocalClass, n: ATypePropdef)
        do
                super(name, cla)

@@ -179,9 +179,9 @@ end
 # Concrete NIT implicit constructor
 class MMImplicitInit
 special MMMethSrcMethod
 # Concrete NIT implicit constructor
 class MMImplicitInit
 special MMMethSrcMethod

-       redef meth is_init do return true
-       readable attr _unassigned_attributes: Array[MMSrcAttribute]
-       readable attr _super_inits: Array[MMLocalProperty]
+       redef fun is_init do return true
+       readable var _unassigned_attributes: Array[MMSrcAttribute]
+       readable var _super_inits: Array[MMLocalProperty]

        init(cla: MMLocalClass, unassigned_attributes: Array[MMSrcAttribute], super_inits: Array[MMLocalProperty])
        do
                super(once "init".to_symbol, cla, null)
        init(cla: MMLocalClass, unassigned_attributes: Array[MMSrcAttribute], super_inits: Array[MMLocalProperty])
        do
                super(once "init".to_symbol, cla, null)

@@ -193,17 +193,17 @@ end
 # Local variables
 abstract class Variable
        # Name of the variable
 # Local variables
 abstract class Variable
        # Name of the variable

-       readable attr _name: Symbol
+       readable var _name: Symbol

 
        # Declaration AST node
 
        # Declaration AST node

-       readable attr _decl: nullable PNode
+       readable var _decl: nullable PNode

 
        # Static type
 
        # Static type

-       readable writable attr _stype: nullable MMType
+       readable writable var _stype: nullable MMType

 
 

-       redef meth to_s do return _name.to_s
+       redef fun to_s do return _name.to_s

 
 

-       meth kind: String is abstract
+       fun kind: String is abstract

 
        init(n: Symbol, d: nullable PNode)
        do
 
        init(n: Symbol, d: nullable PNode)
        do

@@ -215,21 +215,21 @@ end
 # Variable declared with 'var'
 class VarVariable
 special Variable
 # Variable declared with 'var'
 class VarVariable
 special Variable

-       redef meth kind do return once "variable"
+       redef fun kind do return once "variable"

        init(n: Symbol, d: PNode) do super
 end
 
 # Parameter of method (declared in signature)
 class ParamVariable
 special Variable
        init(n: Symbol, d: PNode) do super
 end
 
 # Parameter of method (declared in signature)
 class ParamVariable
 special Variable

-       redef meth kind do return once "parameter"
+       redef fun kind do return once "parameter"

        init(n: Symbol, d: nullable PNode) do super
 end
 
 # Automatic variable (like in the 'for' statement)
 class AutoVariable
 special Variable
        init(n: Symbol, d: nullable PNode) do super
 end
 
 # Automatic variable (like in the 'for' statement)
 class AutoVariable
 special Variable

-       redef meth kind do return once "automatic variable"
+       redef fun kind do return once "automatic variable"

        init(n: Symbol, d: PNode) do super
 end
 
        init(n: Symbol, d: PNode) do super
 end
 

@@ -237,10 +237,10 @@ end
 # Lives in the same namespace than variables
 class ClosureVariable
 special Variable
 # Lives in the same namespace than variables
 class ClosureVariable
 special Variable

-       redef meth kind do return once "closure"
+       redef fun kind do return once "closure"

 
        # The signature of the closure
 
        # The signature of the closure

-       readable attr _closure: MMClosure
+       readable var _closure: MMClosure

 
        init(n: Symbol, d: PNode, c: MMClosure)
        do
 
        init(n: Symbol, d: PNode, c: MMClosure)
        do

@@ -255,106 +255,106 @@ end
 class AbsSyntaxVisitor
 special Visitor
        # The root type Object
 class AbsSyntaxVisitor
 special Visitor
        # The root type Object

-       meth type_object: MMType
+       fun type_object: MMType

        do
                return _module.class_by_name(once ("Object".to_symbol)).get_type
        end
 
        # The primitive type Bool
        do
                return _module.class_by_name(once ("Object".to_symbol)).get_type
        end
 
        # The primitive type Bool

-       meth type_bool: MMType
+       fun type_bool: MMType

        do
                return _module.class_by_name(once ("Bool".to_symbol)).get_type
        end
        
        # The primitive type Int 
        do
                return _module.class_by_name(once ("Bool".to_symbol)).get_type
        end
        
        # The primitive type Int 

-       meth type_int: MMType
+       fun type_int: MMType

        do
                return _module.class_by_name(once ("Int".to_symbol)).get_type
        end
 
        # The primitive type Float
        do
                return _module.class_by_name(once ("Int".to_symbol)).get_type
        end
 
        # The primitive type Float

-       meth type_float: MMType
+       fun type_float: MMType

        do
                return _module.class_by_name(once ("Float".to_symbol)).get_type
        end
 
        # The primitive type Char
        do
                return _module.class_by_name(once ("Float".to_symbol)).get_type
        end
 
        # The primitive type Char

-       meth type_char: MMType
+       fun type_char: MMType

        do
                return _module.class_by_name(once ("Char".to_symbol)).get_type
        end
 
        # The primitive type String
        do
                return _module.class_by_name(once ("Char".to_symbol)).get_type
        end
 
        # The primitive type String

-       meth type_string: MMType
+       fun type_string: MMType

        do
                return _module.class_by_name(once ("String".to_symbol)).get_type
        end
 
        # The primitive type Collection[nullable Object]
        do
                return _module.class_by_name(once ("String".to_symbol)).get_type
        end
 
        # The primitive type Collection[nullable Object]

-       meth type_collection: MMType
+       fun type_collection: MMType

        do
                return _module.class_by_name(once ("Collection".to_symbol)).get_instantiate_type([type_object.as_nullable])
        end
 
        # The primitive type Array[?]
        do
                return _module.class_by_name(once ("Collection".to_symbol)).get_instantiate_type([type_object.as_nullable])
        end
 
        # The primitive type Array[?]

-       meth type_array(stype: MMType): MMType
+       fun type_array(stype: MMType): MMType

        do
                return _module.class_by_name(once ("Array".to_symbol)).get_instantiate_type([stype])
        end
 
        # The primitive type Discrete
        do
                return _module.class_by_name(once ("Array".to_symbol)).get_instantiate_type([stype])
        end
 
        # The primitive type Discrete

-       meth type_discrete: MMType
+       fun type_discrete: MMType

        do
                return _module.class_by_name(once ("Discrete".to_symbol)).get_type
        end
 
        # The primitive type Range[?]
        do
                return _module.class_by_name(once ("Discrete".to_symbol)).get_type
        end
 
        # The primitive type Range[?]

-       meth type_range(stype: MMType): MMType
+       fun type_range(stype: MMType): MMType

        do
                return _module.class_by_name(once ("Range".to_symbol)).get_instantiate_type([stype])
        end
 
        # The primitive type of null
        do
                return _module.class_by_name(once ("Range".to_symbol)).get_instantiate_type([stype])
        end
 
        # The primitive type of null

-       meth type_none: MMType
+       fun type_none: MMType

        do
                return _module.type_none
        end
 
        # The current module
        do
                return _module.type_none
        end
 
        # The current module

-       readable attr _module: MMSrcModule
+       readable var _module: MMSrcModule

 
        # The current class
 
        # The current class

-       meth local_class: MMSrcLocalClass do return _local_class.as(not null)
-       writable attr _local_class: nullable MMSrcLocalClass
+       fun local_class: MMSrcLocalClass do return _local_class.as(not null)
+       writable var _local_class: nullable MMSrcLocalClass

 
        # The current property
 
        # The current property

-       meth local_property: MMLocalProperty do return _local_property.as(not null)
-       writable attr _local_property: nullable MMLocalProperty
+       fun local_property: MMLocalProperty do return _local_property.as(not null)
+       writable var _local_property: nullable MMLocalProperty

 
        # The current tool configuration/status
 
        # The current tool configuration/status

-       readable attr _tc: ToolContext 
+       readable var _tc: ToolContext 

 
        # Display an error for a given syntax node
 
        # Display an error for a given syntax node

-       meth error(n: nullable PNode, s: String)
+       fun error(n: nullable PNode, s: String)

        do
                _tc.error("{locate(n)}: {s}")
        end
 
        # Display a warning for a given syntax node
        do
                _tc.error("{locate(n)}: {s}")
        end
 
        # Display a warning for a given syntax node

-       meth warning(n: nullable PNode, s: String)
+       fun warning(n: nullable PNode, s: String)

        do
                _tc.warning("{locate(n)}: {s}")
        end
 
        #
        do
                _tc.warning("{locate(n)}: {s}")
        end
 
        #

-       meth locate(n: nullable PNode): String
+       fun locate(n: nullable PNode): String

        do
                if n != null then return n.locate
                return _module.filename
        end
 
        # Check conformity and display error
        do
                if n != null then return n.locate
                return _module.filename
        end
 
        # Check conformity and display error

-       meth check_conform(n: PNode, subtype: nullable MMType, stype: nullable MMType): Bool
+       fun check_conform(n: PNode, subtype: nullable MMType, stype: nullable MMType): Bool

        do
                if stype == null or subtype == null then
                        return false
        do
                if stype == null or subtype == null then
                        return false

@@ -369,7 +369,7 @@ special Visitor
        # Check that an expression has a static type and that 
        # Display an error and return false if n is a statement
        # Require that the static type of n is known
        # Check that an expression has a static type and that 
        # Display an error and return false if n is a statement
        # Require that the static type of n is known

-       meth check_expr(n: PExpr): Bool
+       fun check_expr(n: PExpr): Bool

        do
                if not n.is_typed then
                        if tc.error_count == 0 then
        do
                if not n.is_typed then
                        if tc.error_count == 0 then

@@ -387,7 +387,7 @@ special Visitor
        end
 
        # Combine check_conform and check_expr
        end
 
        # Combine check_conform and check_expr

-       meth check_conform_expr(n: PExpr, stype: nullable MMType): Bool
+       fun check_conform_expr(n: PExpr, stype: nullable MMType): Bool

        do
                if stype == null then return false
                if check_expr(n) then return check_conform(n, n.stype, stype) else return false
        do
                if stype == null then return false
                if check_expr(n) then return check_conform(n, n.stype, stype) else return false

@@ -403,7 +403,7 @@ special Visitor
        #   Int, Int, Object => return Object
        #   Int, Float => display error, return null
        #   nullable Int, Object => return nullable Object
        #   Int, Int, Object => return Object
        #   Int, Float => display error, return null
        #   nullable Int, Object => return nullable Object

-       meth check_conform_multiexpr(stype: nullable MMType, nodes: Collection[PExpr]): nullable MMType
+       fun check_conform_multiexpr(stype: nullable MMType, nodes: Collection[PExpr]): nullable MMType

        do
                var node: nullable PExpr = null # candidate node
                for n in nodes do
        do
                var node: nullable PExpr = null # candidate node
                for n in nodes do

@@ -442,15 +442,15 @@ end
 ###############################################################################
 
 redef class PNode
 ###############################################################################
 
 redef class PNode

-       protected meth accept_abs_syntax_visitor(v: AbsSyntaxVisitor) do visit_all(v)
+       protected fun accept_abs_syntax_visitor(v: AbsSyntaxVisitor) do visit_all(v)

 end
 
 redef class Token
 end
 
 redef class Token

-       attr _symbol_cache: nullable Symbol
+       var _symbol_cache: nullable Symbol

 
        # Symbol associated with the text
        # Lazily computed
 
        # Symbol associated with the text
        # Lazily computed

-       meth to_symbol: Symbol
+       fun to_symbol: Symbol

        do
                var s = _symbol_cache
                if s == null then
        do
                var s = _symbol_cache
                if s == null then

@@ -463,73 +463,73 @@ end
 
 redef class PClassdef
        # Associated class (MM entity)
 
 redef class PClassdef
        # Associated class (MM entity)

-       meth local_class: MMSrcLocalClass is abstract
+       fun local_class: MMSrcLocalClass is abstract

 end
 
 redef class AAttrPropdef
        # Associated attribute (MM entity)
 end
 
 redef class AAttrPropdef
        # Associated attribute (MM entity)

-       meth prop: MMSrcAttribute is abstract
+       fun prop: MMSrcAttribute is abstract

 
        # Associated read accessor (MM entity)
 
        # Associated read accessor (MM entity)

-       meth readmethod: nullable MMSrcMethod is abstract
+       fun readmethod: nullable MMSrcMethod is abstract

 
        # Associated write accessor (MM entity)
 
        # Associated write accessor (MM entity)

-       meth writemethod: nullable MMSrcMethod is abstract
+       fun writemethod: nullable MMSrcMethod is abstract

 end
 
 redef class AMethPropdef
        # Associated method (MM entity)
 end
 
 redef class AMethPropdef
        # Associated method (MM entity)

-       meth method: MMMethSrcMethod is abstract
+       fun method: MMMethSrcMethod is abstract

 
        # Associated 'self' variable
 
        # Associated 'self' variable

-       meth self_var: ParamVariable is abstract
+       fun self_var: ParamVariable is abstract

 end
 
 redef class ATypePropdef
        # Associated formal type (MM entity)
 end
 
 redef class ATypePropdef
        # Associated formal type (MM entity)

-       meth prop: MMSrcTypeProperty is abstract
+       fun prop: MMSrcTypeProperty is abstract

 end
 
 redef class PParam
        # Position in the signature
 end
 
 redef class PParam
        # Position in the signature

-       meth position: Int is abstract
+       fun position: Int is abstract

 
        # Associated local variable
 
        # Associated local variable

-       meth variable: ParamVariable is abstract 
+       fun variable: ParamVariable is abstract 

 end
 
 redef class PClosureDecl
        # Associated closure variable
 end
 
 redef class PClosureDecl
        # Associated closure variable

-       meth variable: ClosureVariable is abstract
+       fun variable: ClosureVariable is abstract

 end
 
 redef class PType
        # Retrieve the local class corresponding to the type.
        # Display an error and return null if there is no class
        # Display an error and return null if the type is not class based (formal one)
 end
 
 redef class PType
        # Retrieve the local class corresponding to the type.
        # Display an error and return null if there is no class
        # Display an error and return null if the type is not class based (formal one)

-       meth get_local_class(v: AbsSyntaxVisitor): nullable MMLocalClass is abstract
+       fun get_local_class(v: AbsSyntaxVisitor): nullable MMLocalClass is abstract

 
        # Retrieve corresponding static type.
        # Display an error and return null if there is a problem
 
        # Retrieve corresponding static type.
        # Display an error and return null if there is a problem

-       meth get_stype(v: AbsSyntaxVisitor): nullable MMType is abstract
+       fun get_stype(v: AbsSyntaxVisitor): nullable MMType is abstract

 
        # Retrieve corresponding static type.
        # Display an error and return null if there is a problem
        # But do not performs any subtype check.
        # get_unchecked_stype should be called to check that the static type is fully valid
 
        # Retrieve corresponding static type.
        # Display an error and return null if there is a problem
        # But do not performs any subtype check.
        # get_unchecked_stype should be called to check that the static type is fully valid

-       meth get_unchecked_stype(v: AbsSyntaxVisitor): nullable MMType is abstract
+       fun get_unchecked_stype(v: AbsSyntaxVisitor): nullable MMType is abstract

 
        # Check that a static definition type is conform with regard to formal types
        # Useful with get_unchecked_stype
        # Remember that conformance check need that ancestors are totaly computed
 
        # Check that a static definition type is conform with regard to formal types
        # Useful with get_unchecked_stype
        # Remember that conformance check need that ancestors are totaly computed

-       meth check_conform(v: AbsSyntaxVisitor) is abstract
+       fun check_conform(v: AbsSyntaxVisitor) is abstract

 end
 
 redef class AType
 end
 
 redef class AType

-       attr _stype_cache: nullable MMType = null
-       attr _stype_cached: Bool = false
+       var _stype_cache: nullable MMType = null
+       var _stype_cached: Bool = false

 
 

-       redef meth get_local_class(v)
+       redef fun get_local_class(v)

        do
                var name = n_id.to_symbol
                var mod = v.module
        do
                var name = n_id.to_symbol
                var mod = v.module

@@ -552,7 +552,7 @@ redef class AType
                return local_class
        end
 
                return local_class
        end
 

-       redef meth get_unchecked_stype(v)
+       redef fun get_unchecked_stype(v)

        do
                if _stype_cached then return _stype_cache
                _stype_cached = true
        do
                if _stype_cached then return _stype_cache
                _stype_cached = true

@@ -613,7 +613,7 @@ redef class AType
                return t
        end
        
                return t
        end
        

-       redef meth get_stype(v)
+       redef fun get_stype(v)

        do
                var t = get_unchecked_stype(v)
                if t == null then return null
        do
                var t = get_unchecked_stype(v)
                if t == null then return null

@@ -622,7 +622,7 @@ redef class AType
                return t
        end
 
                return t
        end
 

-       redef meth check_conform(v)
+       redef fun check_conform(v)

        do
                var st = get_unchecked_stype(v)
                if st == null then return 
        do
                var st = get_unchecked_stype(v)
                if st == null then return 

@@ -646,52 +646,52 @@ redef class PExpr
        # Is the expression node correcly typed
        # Return false if typed was not yet computed or
        # if an error occured during the typing computation
        # Is the expression node correcly typed
        # Return false if typed was not yet computed or
        # if an error occured during the typing computation

-       meth is_typed: Bool is abstract
+       fun is_typed: Bool is abstract

 
        # Is the expression node a statement? (ie has no return value)
        # require: is_typed
 
        # Is the expression node a statement? (ie has no return value)
        # require: is_typed

-       meth is_statement: Bool is abstract
+       fun is_statement: Bool is abstract

 
        # The static type of the expression
        # require: is_typed and not is_statement
 
        # The static type of the expression
        # require: is_typed and not is_statement

-       meth stype: MMType is abstract
+       fun stype: MMType is abstract

 end
 
 redef class AVardeclExpr
        # Assiociated local variable
 end
 
 redef class AVardeclExpr
        # Assiociated local variable

-       meth variable: VarVariable is abstract
-       #readable writable attr _variable: nullable VarVariable
+       fun variable: VarVariable is abstract
+       #readable writable var _variable: nullable VarVariable

 end
 
 redef class AForExpr
        # Associated automatic local variable
 end
 
 redef class AForExpr
        # Associated automatic local variable

-       meth variable: AutoVariable is abstract
-       #readable writable attr _variable: nullable AutoVariable
+       fun variable: AutoVariable is abstract
+       #readable writable var _variable: nullable AutoVariable

 end
 
 redef class ASelfExpr
        # Associated local variable
 end
 
 redef class ASelfExpr
        # Associated local variable

-       meth variable: ParamVariable is abstract
-       #readable writable attr _variable: nullable ParamVariable
+       fun variable: ParamVariable is abstract
+       #readable writable var _variable: nullable ParamVariable

 end
 
 redef class AVarFormExpr
        # Associated local variable
 end
 
 redef class AVarFormExpr
        # Associated local variable

-       meth variable: Variable is abstract
-       #readable writable attr _variable: nullable Variable
+       fun variable: Variable is abstract
+       #readable writable var _variable: nullable Variable

 end
 
 redef class AClosureCallExpr
        # Associated closure variable
 end
 
 redef class AClosureCallExpr
        # Associated closure variable

-       meth variable: ClosureVariable is abstract
-       #readable writable attr _variable: nullable ClosureVariable
+       fun variable: ClosureVariable is abstract
+       #readable writable var _variable: nullable ClosureVariable

 end
 
 redef class PClosureDef
        # Associated closure
 end
 
 redef class PClosureDef
        # Associated closure

-       #readable writable attr _closure: nullable MMClosure
-       meth closure: MMClosure is abstract
+       #readable writable var _closure: nullable MMClosure
+       fun closure: MMClosure is abstract

 
        # Automatic variables
 
        # Automatic variables

-       readable writable attr _variables: nullable Array[AutoVariable]
+       readable writable var _variables: nullable Array[AutoVariable]

 end
 end

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 878de83..7730152 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -24,7 +24,7 @@ import control_flow
 redef class MMSrcModule
        # Walk trough the module and type statments and expressions
        # Require than supermodules are processed
 redef class MMSrcModule
        # Walk trough the module and type statments and expressions
        # Require than supermodules are processed

-       meth do_typing(tc: ToolContext)
+       fun do_typing(tc: ToolContext)

        do
                var tv = new TypingVisitor(tc, self)
                tv.visit(node)
        do
                var tv = new TypingVisitor(tc, self)
                tv.visit(node)

@@ -38,55 +38,55 @@ end
 # * Check type conformance
 private class TypingVisitor
 special AbsSyntaxVisitor
 # * Check type conformance
 private class TypingVisitor
 special AbsSyntaxVisitor

-       redef meth visit(n)
+       redef fun visit(n)

        do
                if n != null then n.accept_typing(self)
        end
 
        # Current knowledge about variables names and types
        do
                if n != null then n.accept_typing(self)
        end
 
        # Current knowledge about variables names and types

-       meth variable_ctx: VariableContext do return _variable_ctx.as(not null)
-       writable attr _variable_ctx: nullable VariableContext
+       fun variable_ctx: VariableContext do return _variable_ctx.as(not null)
+       writable var _variable_ctx: nullable VariableContext

 
        # Non-bypassable knowledge about variables names and types
 
        # Non-bypassable knowledge about variables names and types

-       meth base_variable_ctx: VariableContext do return _base_variable_ctx.as(not null)
-       writable attr _base_variable_ctx: nullable VariableContext
+       fun base_variable_ctx: VariableContext do return _base_variable_ctx.as(not null)
+       writable var _base_variable_ctx: nullable VariableContext

 
        # Current knowledge about escapable blocks
 
        # Current knowledge about escapable blocks

-       readable writable attr _escapable_ctx: EscapableContext = new EscapableContext(self)
+       readable writable var _escapable_ctx: EscapableContext = new EscapableContext(self)

 
        # The current reciever
 
        # The current reciever

-       meth self_var: ParamVariable do return _self_var.as(not null)
-       writable attr _self_var: nullable ParamVariable
+       fun self_var: ParamVariable do return _self_var.as(not null)
+       writable var _self_var: nullable ParamVariable

 
        # Block of the current method
 
        # Block of the current method

-       readable writable attr _top_block: nullable PExpr
+       readable writable var _top_block: nullable PExpr

 
        # List of explicit invocation of constructors of super-classes
 
        # List of explicit invocation of constructors of super-classes

-       readable writable attr _explicit_super_init_calls: nullable Array[MMMethod]
+       readable writable var _explicit_super_init_calls: nullable Array[MMMethod]

 
        # Is a other constructor of the same class invoked
 
        # Is a other constructor of the same class invoked

-       readable writable attr _explicit_other_init_call: Bool = false
+       readable writable var _explicit_other_init_call: Bool = false

 
        # Make the if_true_variable_ctx of the expression effective
 
        # Make the if_true_variable_ctx of the expression effective

-       private meth use_if_true_variable_ctx(e: PExpr)
+       private fun use_if_true_variable_ctx(e: PExpr)

        do
                var ctx = e.if_true_variable_ctx
                if ctx != null then variable_ctx = ctx
        end
 
        # Make the if_false_variable_ctx of the expression effective
        do
                var ctx = e.if_true_variable_ctx
                if ctx != null then variable_ctx = ctx
        end
 
        # Make the if_false_variable_ctx of the expression effective

-       private meth use_if_false_variable_ctx(e: PExpr)
+       private fun use_if_false_variable_ctx(e: PExpr)

        do
                var ctx = e.if_false_variable_ctx
                if ctx != null then variable_ctx = ctx
        end
 
        # Number of nested once
        do
                var ctx = e.if_false_variable_ctx
                if ctx != null then variable_ctx = ctx
        end
 
        # Number of nested once

-       readable writable attr _once_count: Int = 0
+       readable writable var _once_count: Int = 0

 
        init(tc, module) do super
 
 
        init(tc, module) do super
 

-       private meth get_default_constructor_for(n: PNode, c: MMLocalClass, prop: MMSrcMethod): nullable MMMethod
+       private fun get_default_constructor_for(n: PNode, c: MMLocalClass, prop: MMSrcMethod): nullable MMMethod

        do
                var v = self
                #var prop = v.local_property
        do
                var v = self
                #var prop = v.local_property

@@ -140,16 +140,16 @@ end
 ###############################################################################
 
 redef class PNode
 ###############################################################################
 
 redef class PNode

-       private meth accept_typing(v: TypingVisitor) 
+       private fun accept_typing(v: TypingVisitor) 

        do
                accept_abs_syntax_visitor(v)
                after_typing(v)
        end
        do
                accept_abs_syntax_visitor(v)
                after_typing(v)
        end

-       private meth after_typing(v: TypingVisitor) do end
+       private fun after_typing(v: TypingVisitor) do end

 end
 
 redef class PClassdef
 end
 
 redef class PClassdef

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                v.self_var = new ParamVariable("self".to_symbol, self)
                v.self_var.stype = local_class.get_type
        do
                v.self_var = new ParamVariable("self".to_symbol, self)
                v.self_var.stype = local_class.get_type

@@ -158,7 +158,7 @@ redef class PClassdef
 end
 
 redef class AAttrPropdef
 end
 
 redef class AAttrPropdef

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                super
                if n_expr != null then
        do
                super
                if n_expr != null then

@@ -168,9 +168,9 @@ redef class AAttrPropdef
 end
 
 redef class AMethPropdef
 end
 
 redef class AMethPropdef

-       redef meth self_var do return _self_var.as(not null)
-       attr _self_var: nullable ParamVariable
-       redef meth accept_typing(v)
+       redef fun self_var do return _self_var.as(not null)
+       var _self_var: nullable ParamVariable
+       redef fun accept_typing(v)

        do
                v.variable_ctx = new RootVariableContext(v, self)
                v.base_variable_ctx = v.variable_ctx
        do
                v.variable_ctx = new RootVariableContext(v, self)
                v.base_variable_ctx = v.variable_ctx

@@ -180,7 +180,7 @@ redef class AMethPropdef
 end
 
 redef class AConcreteMethPropdef
 end
 
 redef class AConcreteMethPropdef

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                super
                if v.variable_ctx.unreash == false and method.signature.return_type != null then
        do
                super
                if v.variable_ctx.unreash == false and method.signature.return_type != null then

@@ -190,9 +190,9 @@ redef class AConcreteMethPropdef
 end
 
 redef class AConcreteInitPropdef
 end
 
 redef class AConcreteInitPropdef

-       readable attr _super_init_calls: Array[MMMethod] = new Array[MMMethod]
-       readable attr _explicit_super_init_calls: Array[MMMethod] = new Array[MMMethod]
-       redef meth accept_typing(v)
+       readable var _super_init_calls: Array[MMMethod] = new Array[MMMethod]
+       readable var _explicit_super_init_calls: Array[MMMethod] = new Array[MMMethod]
+       redef fun accept_typing(v)

        do
                v.top_block = n_block
                v.explicit_super_init_calls = explicit_super_init_calls
        do
                v.top_block = n_block
                v.explicit_super_init_calls = explicit_super_init_calls

@@ -238,7 +238,7 @@ redef class AConcreteInitPropdef
 end
 
 redef class PParam
 end
 
 redef class PParam

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.add(variable)
        end
        do
                v.variable_ctx.add(variable)
        end

@@ -246,9 +246,9 @@ end
 
 redef class AClosureDecl
        # The corresponding escapable object
 
 redef class AClosureDecl
        # The corresponding escapable object

-       readable attr _escapable: nullable EscapableBlock
+       readable var _escapable: nullable EscapableBlock

 
 

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                # Register the closure for ClosureCallExpr
                v.variable_ctx.add(variable)
        do
                # Register the closure for ClosureCallExpr
                v.variable_ctx.add(variable)

@@ -282,19 +282,19 @@ redef class AClosureDecl
 end
 
 redef class PType
 end
 
 redef class PType

-       meth stype: MMType do return _stype.as(not null)
-       attr _stype: nullable MMType
+       fun stype: MMType do return _stype.as(not null)
+       var _stype: nullable MMType

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = get_stype(v)
        end
 end
 
 redef class PExpr
        do
                _stype = get_stype(v)
        end
 end
 
 redef class PExpr

-       redef readable attr _is_typed: Bool = false
-       redef meth is_statement: Bool do return _stype == null
-       redef meth stype
+       redef readable var _is_typed: Bool = false
+       redef fun is_statement: Bool do return _stype == null
+       redef fun stype

        do
                if not is_typed then
                        print "{locate}: not is_typed"
        do
                if not is_typed then
                        print "{locate}: not is_typed"

@@ -306,29 +306,29 @@ redef class PExpr
                end
                return _stype.as(not null)
        end
                end
                return _stype.as(not null)
        end

-       attr _stype: nullable MMType
+       var _stype: nullable MMType

 
        # Is the expression the implicit receiver
 
        # Is the expression the implicit receiver

-       meth is_implicit_self: Bool do return false
+       fun is_implicit_self: Bool do return false

 
        # Is the expression the current receiver (implicit or explicit)
 
        # Is the expression the current receiver (implicit or explicit)

-       meth is_self: Bool do return false
+       fun is_self: Bool do return false

 
        # The variable accessed is any
 
        # The variable accessed is any

-       meth its_variable: nullable Variable do return null
+       fun its_variable: nullable Variable do return null

 
        # The variable type information if current boolean expression is true
 
        # The variable type information if current boolean expression is true

-       readable private attr _if_true_variable_ctx: nullable VariableContext
+       readable private var _if_true_variable_ctx: nullable VariableContext

 
        # The variable type information if current boolean expression is false
 
        # The variable type information if current boolean expression is false

-       readable private attr _if_false_variable_ctx: nullable VariableContext
+       readable private var _if_false_variable_ctx: nullable VariableContext

 end
 
 redef class AVardeclExpr
 end
 
 redef class AVardeclExpr

-       attr _variable: nullable VarVariable
-       redef meth variable do return _variable.as(not null)
+       var _variable: nullable VarVariable
+       redef fun variable do return _variable.as(not null)

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                var va = new VarVariable(n_id.to_symbol, self)
                _variable = va
        do
                var va = new VarVariable(n_id.to_symbol, self)
                _variable = va

@@ -349,7 +349,7 @@ redef class AVardeclExpr
 end
 
 redef class ABlockExpr
 end
 
 redef class ABlockExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var old_var_ctx = v.variable_ctx
                v.variable_ctx = v.variable_ctx.sub(self)
        do
                var old_var_ctx = v.variable_ctx
                v.variable_ctx = v.variable_ctx.sub(self)

@@ -369,7 +369,7 @@ redef class ABlockExpr
 end
 
 redef class AReturnExpr
 end
 
 redef class AReturnExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.unreash = true
                var t = v.local_property.signature.return_type
        do
                v.variable_ctx.unreash = true
                var t = v.local_property.signature.return_type

@@ -386,7 +386,7 @@ redef class AReturnExpr
 end
 
 redef class AContinueExpr
 end
 
 redef class AContinueExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.unreash = true
                var esc = compute_escapable_block(v.escapable_ctx)
        do
                v.variable_ctx.unreash = true
                var esc = compute_escapable_block(v.escapable_ctx)

@@ -410,7 +410,7 @@ redef class AContinueExpr
 end
 
 redef class ABreakExpr
 end
 
 redef class ABreakExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.unreash = true
                var esc = compute_escapable_block(v.escapable_ctx)
        do
                v.variable_ctx.unreash = true
                var esc = compute_escapable_block(v.escapable_ctx)

@@ -430,14 +430,14 @@ redef class ABreakExpr
 end
 
 redef class AAbortExpr
 end
 
 redef class AAbortExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.unreash = true
        end
 end
 
 redef class AIfExpr
        do
                v.variable_ctx.unreash = true
        end
 end
 
 redef class AIfExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var old_var_ctx = v.variable_ctx
                v.visit(n_expr)
        do
                var old_var_ctx = v.variable_ctx
                v.visit(n_expr)

@@ -474,9 +474,9 @@ end
 
 redef class AWhileExpr
        # The corresponding escapable block
 
 redef class AWhileExpr
        # The corresponding escapable block

-       readable attr _escapable: nullable EscapableBlock
+       readable var _escapable: nullable EscapableBlock

 
 

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var escapable = new EscapableBlock(self)
                _escapable = escapable
        do
                var escapable = new EscapableBlock(self)
                _escapable = escapable

@@ -507,21 +507,21 @@ redef class AWhileExpr
 end
 
 redef class AForExpr
 end
 
 redef class AForExpr

-       attr _variable: nullable AutoVariable
-       redef meth variable do return _variable.as(not null)
+       var _variable: nullable AutoVariable
+       redef fun variable do return _variable.as(not null)

 
        # The corresponding escapable block
 
        # The corresponding escapable block

-       readable attr _escapable: nullable EscapableBlock
-
-       attr _meth_iterator: nullable MMMethod
-       meth meth_iterator: MMMethod do return _meth_iterator.as(not null)
-       attr _meth_is_ok: nullable MMMethod
-       meth meth_is_ok: MMMethod do return _meth_is_ok.as(not null)
-       attr _meth_item: nullable MMMethod
-       meth meth_item: MMMethod do return _meth_item.as(not null)
-       attr _meth_next: nullable MMMethod
-       meth meth_next: MMMethod do return _meth_next.as(not null)
-       redef meth accept_typing(v)
+       readable var _escapable: nullable EscapableBlock
+
+       var _meth_iterator: nullable MMMethod
+       fun meth_iterator: MMMethod do return _meth_iterator.as(not null)
+       var _meth_is_ok: nullable MMMethod
+       fun meth_is_ok: MMMethod do return _meth_is_ok.as(not null)
+       var _meth_item: nullable MMMethod
+       fun meth_item: MMMethod do return _meth_item.as(not null)
+       var _meth_next: nullable MMMethod
+       fun meth_next: MMMethod do return _meth_next.as(not null)
+       redef fun accept_typing(v)

        do
                var escapable = new EscapableBlock(self)
                _escapable = escapable
        do
                var escapable = new EscapableBlock(self)
                _escapable = escapable

@@ -576,7 +576,7 @@ redef class AForExpr
 end
 
 redef class AAssertExpr
 end
 
 redef class AAssertExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.check_conform_expr(n_expr, v.type_bool)
                v.use_if_true_variable_ctx(n_expr)
        do
                v.check_conform_expr(n_expr, v.type_bool)
                v.use_if_true_variable_ctx(n_expr)

@@ -585,14 +585,14 @@ redef class AAssertExpr
 end
 
 redef class AVarFormExpr
 end
 
 redef class AVarFormExpr

-       attr _variable: nullable Variable
-       redef meth variable do return _variable.as(not null)
+       var _variable: nullable Variable
+       redef fun variable do return _variable.as(not null)

 end
 
 redef class AVarExpr
 end
 
 redef class AVarExpr

-       redef meth its_variable do return variable
+       redef fun its_variable do return variable

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.check_is_set(self, variable)
                _stype = v.variable_ctx.stype(variable)
        do
                v.variable_ctx.check_is_set(self, variable)
                _stype = v.variable_ctx.stype(variable)

@@ -601,7 +601,7 @@ redef class AVarExpr
 end
 
 redef class AVarAssignExpr
 end
 
 redef class AVarAssignExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.mark_is_set(variable)
                var t = v.variable_ctx.stype(variable)
        do
                v.variable_ctx.mark_is_set(variable)
                var t = v.variable_ctx.stype(variable)

@@ -621,7 +621,7 @@ redef class AReassignFormExpr
        # Compute and check method used through the reassigment operator
        # On success return the static type of the result of the reassigment operator
        # Else display an error and return null
        # Compute and check method used through the reassigment operator
        # On success return the static type of the result of the reassigment operator
        # Else display an error and return null

-       private meth do_rvalue_typing(v: TypingVisitor, type_lvalue: nullable MMType): nullable MMType
+       private fun do_rvalue_typing(v: TypingVisitor, type_lvalue: nullable MMType): nullable MMType

        do
                if type_lvalue == null then
                        return null
        do
                if type_lvalue == null then
                        return null

@@ -641,11 +641,11 @@ redef class AReassignFormExpr
        end
 
        # Method used through the reassigment operator (once computed)
        end
 
        # Method used through the reassigment operator (once computed)

-       readable attr _assign_method: nullable MMMethod
+       readable var _assign_method: nullable MMMethod

 end
 
 redef class AVarReassignExpr
 end
 
 redef class AVarReassignExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.variable_ctx.check_is_set(self, variable)
                v.variable_ctx.mark_is_set(variable)
        do
                v.variable_ctx.check_is_set(self, variable)
                v.variable_ctx.mark_is_set(variable)

@@ -665,37 +665,37 @@ redef class AVarReassignExpr
 end
 
 redef class PAssignOp
 end
 
 redef class PAssignOp

-       meth method_name: Symbol is abstract
+       fun method_name: Symbol is abstract

 end
 redef class APlusAssignOp
 end
 redef class APlusAssignOp

-       redef meth method_name do return once "+".to_symbol
+       redef fun method_name do return once "+".to_symbol

 end
 redef class AMinusAssignOp
 end
 redef class AMinusAssignOp

-       redef meth method_name do return once "-".to_symbol
+       redef fun method_name do return once "-".to_symbol

 end
 
 redef class ASelfExpr
 end
 
 redef class ASelfExpr

-       attr _variable: nullable ParamVariable
-       redef meth variable do return _variable.as(not null)
+       var _variable: nullable ParamVariable
+       redef fun variable do return _variable.as(not null)

 
 

-       redef meth its_variable do return variable
+       redef fun its_variable do return variable

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _variable = v.self_var
                _stype = v.variable_ctx.stype(variable)
                _is_typed = true
        end
 
        do
                _variable = v.self_var
                _stype = v.variable_ctx.stype(variable)
                _is_typed = true
        end
 

-        redef meth is_self do return true
+        redef fun is_self do return true

 end
 
 redef class AImplicitSelfExpr
 end
 
 redef class AImplicitSelfExpr

-        redef meth is_implicit_self do return true
+        redef fun is_implicit_self do return true

 end
 
 redef class AIfexprExpr
 end
 
 redef class AIfexprExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var old_var_ctx = v.variable_ctx
 
        do
                var old_var_ctx = v.variable_ctx
 

@@ -714,7 +714,7 @@ redef class AIfexprExpr
 end
 
 redef class ABoolExpr
 end
 
 redef class ABoolExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = v.type_bool
                _is_typed = true
        do
                _stype = v.type_bool
                _is_typed = true

@@ -722,7 +722,7 @@ redef class ABoolExpr
 end
 
 redef class AOrExpr
 end
 
 redef class AOrExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var old_var_ctx = v.variable_ctx
 
        do
                var old_var_ctx = v.variable_ctx
 

@@ -746,7 +746,7 @@ redef class AOrExpr
 end
 
 redef class AAndExpr
 end
 
 redef class AAndExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                var old_var_ctx = v.variable_ctx
 
        do
                var old_var_ctx = v.variable_ctx
 

@@ -770,7 +770,7 @@ redef class AAndExpr
 end
 
 redef class ANotExpr
 end
 
 redef class ANotExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                v.check_conform_expr(n_expr, v.type_bool)
 
        do
                v.check_conform_expr(n_expr, v.type_bool)
 

@@ -784,7 +784,7 @@ redef class ANotExpr
 end
 
 redef class AIntExpr
 end
 
 redef class AIntExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = v.type_int
                _is_typed = true
        do
                _stype = v.type_int
                _is_typed = true

@@ -792,7 +792,7 @@ redef class AIntExpr
 end
 
 redef class AFloatExpr
 end
 
 redef class AFloatExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = v.type_float
                _is_typed = true
        do
                _stype = v.type_float
                _is_typed = true

@@ -800,7 +800,7 @@ redef class AFloatExpr
 end
 
 redef class ACharExpr
 end
 
 redef class ACharExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = v.type_char
                _is_typed = true
        do
                _stype = v.type_char
                _is_typed = true

@@ -808,9 +808,9 @@ redef class ACharExpr
 end
 
 redef class AStringFormExpr
 end
 
 redef class AStringFormExpr

-       attr _meth_with_native: nullable MMMethod
-       meth meth_with_native: MMMethod do return _meth_with_native.as(not null)
-       redef meth after_typing(v)
+       var _meth_with_native: nullable MMMethod
+       fun meth_with_native: MMMethod do return _meth_with_native.as(not null)
+       redef fun after_typing(v)

        do
                _stype = v.type_string
                _is_typed = true
        do
                _stype = v.type_string
                _is_typed = true

@@ -820,14 +820,14 @@ redef class AStringFormExpr
 end
 
 redef class ASuperstringExpr
 end
 
 redef class ASuperstringExpr

-       meth meth_with_capacity: MMMethod do return _meth_with_capacity.as(not null)
-       attr _meth_with_capacity: nullable MMMethod
-       meth meth_add: MMMethod do return _meth_add.as(not null)
-       attr _meth_add: nullable MMMethod
-       meth meth_to_s: MMMethod do return _meth_to_s.as(not null)
-       attr _meth_to_s: nullable MMMethod
-       readable attr _atype: nullable MMType
-       redef meth after_typing(v)
+       fun meth_with_capacity: MMMethod do return _meth_with_capacity.as(not null)
+       var _meth_with_capacity: nullable MMMethod
+       fun meth_add: MMMethod do return _meth_add.as(not null)
+       var _meth_add: nullable MMMethod
+       fun meth_to_s: MMMethod do return _meth_to_s.as(not null)
+       var _meth_to_s: nullable MMMethod
+       readable var _atype: nullable MMType
+       redef fun after_typing(v)

        do
                var stype = v.type_string
                _stype = stype
        do
                var stype = v.type_string
                _stype = stype

@@ -844,7 +844,7 @@ redef class ASuperstringExpr
 end
 
 redef class ANullExpr
 end
 
 redef class ANullExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                _stype = v.type_none
                _is_typed = true
        do
                _stype = v.type_none
                _is_typed = true

@@ -852,18 +852,18 @@ redef class ANullExpr
 end
 
 redef class AArrayExpr
 end
 
 redef class AArrayExpr

-       meth meth_with_capacity: MMMethod do return _meth_with_capacity.as(not null)
-       attr _meth_with_capacity: nullable MMMethod
-       meth meth_add: MMMethod do return _meth_add.as(not null)
-       attr _meth_add: nullable MMMethod
+       fun meth_with_capacity: MMMethod do return _meth_with_capacity.as(not null)
+       var _meth_with_capacity: nullable MMMethod
+       fun meth_add: MMMethod do return _meth_add.as(not null)
+       var _meth_add: nullable MMMethod

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                var stype = v.check_conform_multiexpr(null, n_exprs)
                if stype != null then do_typing(v, stype)
        end
 
        do
                var stype = v.check_conform_multiexpr(null, n_exprs)
                if stype != null then do_typing(v, stype)
        end
 

-       private meth do_typing(v: TypingVisitor, element_type: MMType)
+       private fun do_typing(v: TypingVisitor, element_type: MMType)

        do
                _stype = v.type_array(element_type)
 
        do
                _stype = v.type_array(element_type)
 

@@ -877,9 +877,9 @@ redef class AArrayExpr
 end
 
 redef class ARangeExpr
 end
 
 redef class ARangeExpr

-       meth meth_init: MMMethod do return _meth_init.as(not null)
-       attr _meth_init: nullable MMMethod
-       redef meth after_typing(v)
+       fun meth_init: MMMethod do return _meth_init.as(not null)
+       var _meth_init: nullable MMMethod
+       redef fun after_typing(v)

        do
                if not v.check_expr(n_expr) or not v.check_expr(n_expr2) then return
                var ntype = n_expr.stype
        do
                if not v.check_expr(n_expr) or not v.check_expr(n_expr2) then return
                var ntype = n_expr.stype

@@ -898,14 +898,14 @@ redef class ARangeExpr
 end
 
 redef class ACrangeExpr
 end
 
 redef class ACrangeExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                super
                _meth_init = stype.local_class.select_method(once "init".to_symbol)
        end
 end
 redef class AOrangeExpr
        do
                super
                _meth_init = stype.local_class.select_method(once "init".to_symbol)
        end
 end
 redef class AOrangeExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                super
                _meth_init = stype.local_class.select_method(once "without_last".to_symbol)
        do
                super
                _meth_init = stype.local_class.select_method(once "without_last".to_symbol)

@@ -915,9 +915,9 @@ end
 
 redef class ASuperExpr
 special ASuperInitCall
 
 redef class ASuperExpr
 special ASuperInitCall

-       # readable attr _prop: MMSrcMethod
-       readable attr _init_in_superclass: nullable MMMethod
-       redef meth after_typing(v)
+       # readable var _prop: MMSrcMethod
+       readable var _init_in_superclass: nullable MMMethod
+       redef fun after_typing(v)

        do
                var precs: Array[MMLocalProperty] = v.local_property.prhe.direct_greaters
                if not precs.is_empty then
        do
                var precs: Array[MMLocalProperty] = v.local_property.prhe.direct_greaters
                if not precs.is_empty then

@@ -976,13 +976,13 @@ end
 
 redef class AAttrFormExpr
        # Attribute accessed
 
 redef class AAttrFormExpr
        # Attribute accessed

-       readable attr _prop: nullable MMAttribute
+       readable var _prop: nullable MMAttribute

 
        # Attribute type of the acceded attribute
 
        # Attribute type of the acceded attribute

-       readable attr _attr_type: nullable MMType
+       readable var _attr_type: nullable MMType

 
        # Compute the attribute accessed
 
        # Compute the attribute accessed

-       private meth do_typing(v: TypingVisitor)
+       private fun do_typing(v: TypingVisitor)

        do
                if not v.check_expr(n_expr) then return
                var type_recv = n_expr.stype
        do
                if not v.check_expr(n_expr) then return
                var type_recv = n_expr.stype

@@ -1004,7 +1004,7 @@ redef class AAttrFormExpr
 end
 
 redef class AAttrExpr
 end
 
 redef class AAttrExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                do_typing(v)
                if prop == null then return
        do
                do_typing(v)
                if prop == null then return

@@ -1014,7 +1014,7 @@ redef class AAttrExpr
 end
 
 redef class AAttrAssignExpr
 end
 
 redef class AAttrAssignExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                do_typing(v)
                if prop == null then return
        do
                do_typing(v)
                if prop == null then return

@@ -1024,7 +1024,7 @@ redef class AAttrAssignExpr
 end
 
 redef class AAttrReassignExpr
 end
 
 redef class AAttrReassignExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                do_typing(v)
                if prop == null then return
        do
                do_typing(v)
                if prop == null then return

@@ -1036,7 +1036,7 @@ redef class AAttrReassignExpr
 end
 
 redef class AIssetAttrExpr
 end
 
 redef class AIssetAttrExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                do_typing(v)
                if prop == null then return
        do
                do_typing(v)
                if prop == null then return

@@ -1051,13 +1051,13 @@ end
 class AAbsAbsSendExpr
 special PExpr
        # The signature of the called property
 class AAbsAbsSendExpr
 special PExpr
        # The signature of the called property

-       readable attr _prop_signature: nullable MMSignature
+       readable var _prop_signature: nullable MMSignature

 
        # The real arguments used (after star transformation) (once computed)
 
        # The real arguments used (after star transformation) (once computed)

-       readable attr _arguments: nullable Array[PExpr]
+       readable var _arguments: nullable Array[PExpr]

 
        # Check the conformity of a set of arguments `raw_args' to a signature.
 
        # Check the conformity of a set of arguments `raw_args' to a signature.

-       private meth process_signature(v: TypingVisitor, psig: MMSignature, name: Symbol, raw_args: nullable Array[PExpr]): nullable Array[PExpr]
+       private fun process_signature(v: TypingVisitor, psig: MMSignature, name: Symbol, raw_args: nullable Array[PExpr]): nullable Array[PExpr]

        do
                var par_vararg = psig.vararg_rank
                var par_arity = psig.arity
        do
                var par_vararg = psig.vararg_rank
                var par_arity = psig.arity

@@ -1094,7 +1094,7 @@ special PExpr
        end
 
        # Check the conformity of a set of defined closures
        end
 
        # Check the conformity of a set of defined closures

-       private meth process_closures(v: TypingVisitor, psig: MMSignature, name: Symbol, cd: nullable Array[PClosureDef]): nullable MMType
+       private fun process_closures(v: TypingVisitor, psig: MMSignature, name: Symbol, cd: nullable Array[PClosureDef]): nullable MMType

        do
                var t = psig.return_type
                var cs = psig.closures # Declared closures
        do
                var t = psig.return_type
                var cs = psig.closures # Declared closures

@@ -1137,7 +1137,7 @@ end
 class AAbsSendExpr
 special AAbsAbsSendExpr
        # Compute the called global property
 class AAbsSendExpr
 special AAbsAbsSendExpr
        # Compute the called global property

-       private meth do_typing(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, recv_is_self: Bool, name: Symbol, raw_args: nullable Array[PExpr], closure_defs: nullable Array[PClosureDef])
+       private fun do_typing(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, recv_is_self: Bool, name: Symbol, raw_args: nullable Array[PExpr], closure_defs: nullable Array[PClosureDef])

        do
                var prop = get_property(v, type_recv, is_implicit_self, name)
                if prop == null then return
        do
                var prop = get_property(v, type_recv, is_implicit_self, name)
                if prop == null then return

@@ -1152,7 +1152,7 @@ special AAbsAbsSendExpr
                _return_type = rtype
        end
 
                _return_type = rtype
        end
 

-       private meth get_property(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, name: Symbol): nullable MMMethod
+       private fun get_property(v: TypingVisitor, type_recv: MMType, is_implicit_self: Bool, name: Symbol): nullable MMMethod

        do
                var lc = type_recv.local_class
                var prop: nullable MMMethod = null
        do
                var lc = type_recv.local_class
                var prop: nullable MMMethod = null

@@ -1181,7 +1181,7 @@ special AAbsAbsSendExpr
        end
 
        # Get the signature for a local property and a receiver
        end
 
        # Get the signature for a local property and a receiver

-       private meth get_signature(v: TypingVisitor, type_recv: MMType, prop: MMMethod, recv_is_self: Bool): MMSignature
+       private fun get_signature(v: TypingVisitor, type_recv: MMType, prop: MMMethod, recv_is_self: Bool): MMSignature

        do
                prop.global.check_visibility(v, self, v.module, recv_is_self)
                var psig = prop.signature_for(type_recv)
        do
                prop.global.check_visibility(v, self, v.module, recv_is_self)
                var psig = prop.signature_for(type_recv)

@@ -1190,17 +1190,17 @@ special AAbsAbsSendExpr
        end
 
        # The invoked method (once computed)
        end
 
        # The invoked method (once computed)

-       readable attr _prop: nullable MMMethod
+       readable var _prop: nullable MMMethod

 
        # The return type (if any) (once computed)
 
        # The return type (if any) (once computed)

-       readable attr _return_type: nullable MMType
+       readable var _return_type: nullable MMType

 end
 
 # A possible call of constructor in a super class
 # Could be an explicit call or with the 'super' keyword
 class ASuperInitCall
 special AAbsSendExpr
 end
 
 # A possible call of constructor in a super class
 # Could be an explicit call or with the 'super' keyword
 class ASuperInitCall
 special AAbsSendExpr

-       private meth register_super_init_call(v: TypingVisitor, property: MMMethod)
+       private fun register_super_init_call(v: TypingVisitor, property: MMMethod)

        do
                if parent != v.top_block and self != v.top_block then
                        v.error(self, "Error: Constructor invocation {property} must not be in nested block.")
        do
                if parent != v.top_block and self != v.top_block then
                        v.error(self, "Error: Constructor invocation {property} must not be in nested block.")

@@ -1238,7 +1238,7 @@ end
 
 redef class ANewExpr
 special AAbsSendExpr
 
 redef class ANewExpr
 special AAbsSendExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                if n_type._stype == null then return
                var t = n_type.stype
        do
                if n_type._stype == null then return
                var t = n_type.stype

@@ -1269,20 +1269,20 @@ end
 redef class ASendExpr
 special ASuperInitCall
        # Name of the invoked property
 redef class ASendExpr
 special ASuperInitCall
        # Name of the invoked property

-       meth name: Symbol is abstract 
+       fun name: Symbol is abstract 

 
        # Raw arguments used (withour star transformation)
 
        # Raw arguments used (withour star transformation)

-       meth raw_arguments: nullable Array[PExpr] is abstract
+       fun raw_arguments: nullable Array[PExpr] is abstract

 
        # Closure definitions
 
        # Closure definitions

-       meth closure_defs: nullable Array[PClosureDef] do return null
+       fun closure_defs: nullable Array[PClosureDef] do return null

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                do_all_typing(v)
        end
 
        do
                do_all_typing(v)
        end
 

-       private meth do_all_typing(v: TypingVisitor)
+       private fun do_all_typing(v: TypingVisitor)

        do
                if not v.check_expr(n_expr) then return
                do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_arguments, closure_defs)
        do
                if not v.check_expr(n_expr) then return
                do_typing(v, n_expr.stype, n_expr.is_implicit_self, n_expr.is_self, name, raw_arguments, closure_defs)

@@ -1307,8 +1307,8 @@ end
 class ASendReassignExpr
 special ASendExpr
 special AReassignFormExpr
 class ASendReassignExpr
 special ASendExpr
 special AReassignFormExpr

-       readable attr _read_prop: nullable MMMethod
-       redef meth do_all_typing(v)
+       readable var _read_prop: nullable MMMethod
+       redef fun do_all_typing(v)

        do
                if not v.check_expr(n_expr) then return
                var raw_args = raw_arguments
        do
                if not v.check_expr(n_expr) then return
                var raw_args = raw_arguments

@@ -1348,11 +1348,11 @@ special AReassignFormExpr
 end
 
 redef class ABinopExpr
 end
 
 redef class ABinopExpr

-       redef meth raw_arguments do return [n_expr2]
+       redef fun raw_arguments do return [n_expr2]

 end
 redef class AEqExpr
 end
 redef class AEqExpr

-       redef meth name do return once "==".to_symbol
-       redef meth after_typing(v)
+       redef fun name do return once "==".to_symbol
+       redef fun after_typing(v)

        do
                super
                if not is_typed then return
        do
                super
                if not is_typed then return

@@ -1368,7 +1368,7 @@ redef class AEqExpr
                end
        end
 
                end
        end
 

-       private meth try_to_isa(v: TypingVisitor, n: PExpr)
+       private fun try_to_isa(v: TypingVisitor, n: PExpr)

        do
                var variable = n.its_variable
                if variable != null then
        do
                var variable = n.its_variable
                if variable != null then

@@ -1377,8 +1377,8 @@ redef class AEqExpr
        end
 end
 redef class ANeExpr
        end
 end
 redef class ANeExpr

-       redef meth name do return once "!=".to_symbol
-       redef meth after_typing(v)
+       redef fun name do return once "!=".to_symbol
+       redef fun after_typing(v)

        do
                super
                if not is_typed then return
        do
                super
                if not is_typed then return

@@ -1394,7 +1394,7 @@ redef class ANeExpr
                end
        end
 
                end
        end
 

-       private meth try_to_isa(v: TypingVisitor, n: PExpr)
+       private fun try_to_isa(v: TypingVisitor, n: PExpr)

        do
                var variable = n.its_variable
                if variable != null then
        do
                var variable = n.its_variable
                if variable != null then

@@ -1403,43 +1403,43 @@ redef class ANeExpr
        end
 end
 redef class ALtExpr
        end
 end
 redef class ALtExpr

-       redef meth name do return once "<".to_symbol
+       redef fun name do return once "<".to_symbol

 end
 redef class ALeExpr
 end
 redef class ALeExpr

-       redef meth name do return once "<=".to_symbol
+       redef fun name do return once "<=".to_symbol

 end
 redef class AGtExpr
 end
 redef class AGtExpr

-       redef meth name do return once ">".to_symbol
+       redef fun name do return once ">".to_symbol

 end
 redef class AGeExpr
 end
 redef class AGeExpr

-       redef meth name do return once ">=".to_symbol
+       redef fun name do return once ">=".to_symbol

 end
 redef class APlusExpr
 end
 redef class APlusExpr

-       redef meth name do return once "+".to_symbol
+       redef fun name do return once "+".to_symbol

 end
 redef class AMinusExpr
 end
 redef class AMinusExpr

-       redef meth name do return once "-".to_symbol
+       redef fun name do return once "-".to_symbol

 end
 redef class AStarshipExpr
 end
 redef class AStarshipExpr

-       redef meth name do return once "<=>".to_symbol
+       redef fun name do return once "<=>".to_symbol

 end
 redef class AStarExpr
 end
 redef class AStarExpr

-       redef meth name do return once "*".to_symbol
+       redef fun name do return once "*".to_symbol

 end
 redef class ASlashExpr
 end
 redef class ASlashExpr

-       redef meth name do return once "/".to_symbol
+       redef fun name do return once "/".to_symbol

 end
 redef class APercentExpr
 end
 redef class APercentExpr

-       redef meth name do return once "%".to_symbol
+       redef fun name do return once "%".to_symbol

 end
 
 redef class AUminusExpr
 end
 
 redef class AUminusExpr

-       redef meth name do return once "unary -".to_symbol
-       redef meth raw_arguments do return null
+       redef fun name do return once "unary -".to_symbol
+       redef fun raw_arguments do return null

 end
 
 redef class ACallFormExpr
 end
 
 redef class ACallFormExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                if n_expr.is_implicit_self then
                        var name = n_id.to_symbol
        do
                if n_expr.is_implicit_self then
                        var name = n_id.to_symbol

@@ -1468,7 +1468,7 @@ redef class ACallFormExpr
                super
        end
 
                super
        end
 

-       redef meth closure_defs
+       redef fun closure_defs

        do
                if n_closure_defs.is_empty then
                        return null
        do
                if n_closure_defs.is_empty then
                        return null

@@ -1478,27 +1478,27 @@ redef class ACallFormExpr
        end
 
        # Create a variable acces corresponding to the call form
        end
 
        # Create a variable acces corresponding to the call form

-       meth variable_create(variable: Variable): AVarFormExpr is abstract
+       fun variable_create(variable: Variable): AVarFormExpr is abstract

 end
 
 redef class ACallExpr
 end
 
 redef class ACallExpr

-       redef meth variable_create(variable)
+       redef fun variable_create(variable)

        do
                return new AVarExpr.init_avarexpr(n_id)
        end
 
        do
                return new AVarExpr.init_avarexpr(n_id)
        end
 

-       redef meth name do return n_id.to_symbol
-       redef meth raw_arguments do return n_args.to_a
+       redef fun name do return n_id.to_symbol
+       redef fun raw_arguments do return n_args.to_a

 end
 
 redef class ACallAssignExpr
 end
 
 redef class ACallAssignExpr

-       redef meth variable_create(variable)
+       redef fun variable_create(variable)

        do
                return new AVarAssignExpr.init_avarassignexpr(n_id, n_assign, n_value)
        end
 
        do
                return new AVarAssignExpr.init_avarassignexpr(n_id, n_assign, n_value)
        end
 

-       redef meth name do return (n_id.text + "=").to_symbol
-       redef meth raw_arguments do
+       redef fun name do return (n_id.text + "=").to_symbol
+       redef fun raw_arguments do

                var res = n_args.to_a
                res.add(n_value)
                return res
                var res = n_args.to_a
                res.add(n_value)
                return res

@@ -1507,23 +1507,23 @@ end
 
 redef class ACallReassignExpr
 special ASendReassignExpr
 
 redef class ACallReassignExpr
 special ASendReassignExpr

-       redef meth variable_create(variable)
+       redef fun variable_create(variable)

        do
                return new AVarReassignExpr.init_avarreassignexpr(n_id, n_assign_op, n_value)
        end
 
        do
                return new AVarReassignExpr.init_avarreassignexpr(n_id, n_assign_op, n_value)
        end
 

-       redef meth name do return n_id.to_symbol
-       redef meth raw_arguments do return n_args.to_a
+       redef fun name do return n_id.to_symbol
+       redef fun raw_arguments do return n_args.to_a

 end
 
 redef class ABraExpr
 end
 
 redef class ABraExpr

-       redef meth name do return once "[]".to_symbol
-       redef meth raw_arguments do return n_args.to_a
+       redef fun name do return once "[]".to_symbol
+       redef fun raw_arguments do return n_args.to_a

 end
 
 redef class ABraAssignExpr
 end
 
 redef class ABraAssignExpr

-       redef meth name do return once "[]=".to_symbol
-       redef meth raw_arguments do
+       redef fun name do return once "[]=".to_symbol
+       redef fun raw_arguments do

                var res = n_args.to_a
                res.add(n_value)
                return res
                var res = n_args.to_a
                res.add(n_value)
                return res

@@ -1532,21 +1532,21 @@ end
 
 redef class ABraReassignExpr
 special ASendReassignExpr
 
 redef class ABraReassignExpr
 special ASendReassignExpr

-       redef meth name do return once "[]".to_symbol
-       redef meth raw_arguments do return n_args.to_a
+       redef fun name do return once "[]".to_symbol
+       redef fun raw_arguments do return n_args.to_a

 end
 
 redef class AInitExpr
 end
 
 redef class AInitExpr

-       redef meth name do return once "init".to_symbol
-       redef meth raw_arguments do return n_args.to_a
+       redef fun name do return once "init".to_symbol
+       redef fun raw_arguments do return n_args.to_a

 end
 
 redef class AClosureCallExpr
 special AAbsAbsSendExpr
 end
 
 redef class AClosureCallExpr
 special AAbsAbsSendExpr

-       attr _variable: nullable ClosureVariable
-       redef meth variable do return _variable.as(not null)
+       var _variable: nullable ClosureVariable
+       redef fun variable do return _variable.as(not null)

 
 

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                var va = variable
                if va.closure.is_break then v.variable_ctx.unreash = true
        do
                var va = variable
                if va.closure.is_break then v.variable_ctx.unreash = true

@@ -1564,24 +1564,24 @@ special AAbsAbsSendExpr
 end
 
 redef class PClosureDef
 end
 
 redef class PClosureDef

-       attr _closure: nullable MMClosure
-       redef meth closure do return _closure.as(not null)
+       var _closure: nullable MMClosure
+       redef fun closure do return _closure.as(not null)

 
        # The corresponding escapable object
 
        # The corresponding escapable object

-       readable attr _escapable: nullable EscapableBlock
+       readable var _escapable: nullable EscapableBlock

 
 

-       attr _accept_typing2: Bool = false
-       redef meth accept_typing(v)
+       var _accept_typing2: Bool = false
+       redef fun accept_typing(v)

        do
                # Typing is deferred, wait accept_typing2(v)
                if _accept_typing2 then super
        end
 
        do
                # Typing is deferred, wait accept_typing2(v)
                if _accept_typing2 then super
        end
 

-       private meth accept_typing2(v: TypingVisitor, esc: EscapableClosure) is abstract
+       private fun accept_typing2(v: TypingVisitor, esc: EscapableClosure) is abstract

 end
 
 redef class AClosureDef
 end
 
 redef class AClosureDef

-       redef meth accept_typing2(v, esc)
+       redef fun accept_typing2(v, esc)

        do
                _escapable = esc
 
        do
                _escapable = esc
 

@@ -1622,7 +1622,7 @@ end
 
 class ATypeCheckExpr
 special PExpr
 
 class ATypeCheckExpr
 special PExpr

-       private meth check_expr_cast(v: TypingVisitor, n_expr: PExpr, n_type: PType)
+       private fun check_expr_cast(v: TypingVisitor, n_expr: PExpr, n_type: PType)

        do
                if not v.check_expr(n_expr) then return
                var etype = n_expr.stype
        do
                if not v.check_expr(n_expr) then return
                var etype = n_expr.stype

@@ -1649,7 +1649,7 @@ end
 
 redef class AIsaExpr
 special ATypeCheckExpr
 
 redef class AIsaExpr
 special ATypeCheckExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                check_expr_cast(v, n_expr, n_type)
                var variable = n_expr.its_variable
        do
                check_expr_cast(v, n_expr, n_type)
                var variable = n_expr.its_variable

@@ -1663,7 +1663,7 @@ end
 
 redef class AAsCastExpr
 special ATypeCheckExpr
 
 redef class AAsCastExpr
 special ATypeCheckExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                check_expr_cast(v, n_expr, n_type)
                _stype = n_type.stype
        do
                check_expr_cast(v, n_expr, n_type)
                _stype = n_type.stype

@@ -1672,7 +1672,7 @@ special ATypeCheckExpr
 end
 
 redef class AAsNotnullExpr
 end
 
 redef class AAsNotnullExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                if not v.check_expr(n_expr) then return
                var t = n_expr.stype
        do
                if not v.check_expr(n_expr) then return
                var t = n_expr.stype

@@ -1688,7 +1688,7 @@ redef class AAsNotnullExpr
 end
 
 redef class AProxyExpr
 end
 
 redef class AProxyExpr

-       redef meth after_typing(v)
+       redef fun after_typing(v)

        do
                if not n_expr.is_typed then return
                _is_typed = true
        do
                if not n_expr.is_typed then return
                _is_typed = true

@@ -1698,7 +1698,7 @@ redef class AProxyExpr
 end
 
 redef class AOnceExpr
 end
 
 redef class AOnceExpr

-       redef meth accept_typing(v)
+       redef fun accept_typing(v)

        do
                if v.once_count > 0 then
                        v.warning(self, "Useless once in a once expression.")
        do
                if v.once_count > 0 then
                        v.warning(self, "Useless once in a once expression.")

diff --git a/src/utils.nit b/src/utils.nit
index f8dbfbd..93f3e35 100644 (file)
--- a/src/utils.nit
+++ b/src/utils.nit
@@ -19,7 +19,7 @@
 package utils
 
 # Mangle an array of symbol using only alphanums and underscores
 package utils
 
 # Mangle an array of symbol using only alphanums and underscores

-meth cmangle(symbols: Symbol...): String
+fun cmangle(symbols: Symbol...): String

 do
        var table = once cmangle_table
        var res = new Buffer
 do
        var table = once cmangle_table
        var res = new Buffer

@@ -56,7 +56,7 @@ do
 end
 
 # Build the table that associates character to mangle to string
 end
 
 # Build the table that associates character to mangle to string

-private meth cmangle_table: HashMap[Char, String]
+private fun cmangle_table: HashMap[Char, String]

 do
        var res = new HashMap[Char, String]
        res['+'] = "plus"
 do
        var res = new HashMap[Char, String]
        res['+'] = "plus"

diff --git a/tests/base_abort.nit b/tests/base_abort.nit
index 6922ad0..e2f4b69 100644 (file)
--- a/tests/base_abort.nit
+++ b/tests/base_abort.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
 
 import kernel
 

-meth foo: Int
+fun foo: Int

 do
        abort
 end
 do
        abort
 end

diff --git a/tests/base_as_cast.nit b/tests/base_as_cast.nit
index a93c628..d1637fa 100644 (file)
--- a/tests/base_as_cast.nit
+++ b/tests/base_as_cast.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class O
 import kernel
 
 class O

-       redef meth output do 0.output
+       redef fun output do 0.output

 end
 
 class A
 end
 
 class A

@@ -26,13 +26,13 @@ special O
 end
 
 class U
 end
 
 class U

-       redef meth output do 1.output
+       redef fun output do 1.output

 end
 
 class B
 special A
 special U
 end
 
 class B
 special A
 special U

-       redef meth output do 2.output
+       redef fun output do 2.output

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_as_notnull.nit b/tests/base_as_notnull.nit
index aee5acb..eaeb85c 100644 (file)
--- a/tests/base_as_notnull.nit
+++ b/tests/base_as_notnull.nit
@@ -17,8 +17,8 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       attr _i: Int
-       redef meth output do _i.output
+       var _i: Int
+       redef fun output do _i.output

        init(i: Int) do _i = i
 end
 
        init(i: Int) do _i = i
 end
 

@@ -26,8 +26,8 @@ class B
 special A
 end
 
 special A
 end
 

-meth outa(a: A) do a.output
-meth outb(b: B) do b.output
+fun outa(a: A) do a.output
+fun outb(b: B) do b.output

 
 var a: A = new A(1)
 var ab: A = new B(2)
 
 var a: A = new A(1)
 var ab: A = new B(2)

diff --git a/tests/base_attr.nit b/tests/base_attr.nit
index 21f52a6..bb60484 100644 (file)
--- a/tests/base_attr.nit
+++ b/tests/base_attr.nit
@@ -20,13 +20,13 @@ class Object
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
+       fun output is intern

 end
 
 class Foo
 end
 
 class Foo

-       attr _a1: Int
-       attr _a2: Int
-       meth run
+       var _a1: Int
+       var _a2: Int
+       fun run

        do
                _a1.output
                _a2.output
        do
                _a1.output
                _a2.output

@@ -41,8 +41,8 @@ end
 
 class Bar
 special Foo
 
 class Bar
 special Foo

-       attr _a3: Int
-       redef meth run
+       var _a3: Int
+       redef fun run

        do
                _a1.output
                _a2.output
        do
                _a1.output
                _a2.output

diff --git a/tests/base_attr_def.nit b/tests/base_attr_def.nit
index c11247e..693fe5d 100644 (file)
--- a/tests/base_attr_def.nit
+++ b/tests/base_attr_def.nit
@@ -20,13 +20,13 @@ class Object
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
+       fun output is intern

 end
 
 class Foo
 end
 
 class Foo

-       readable writable attr _a1: Int 
-       readable writable attr _a2: Int
-       meth run
+       readable writable var _a1: Int 
+       readable writable var _a2: Int
+       fun run

        do
                a1.output
                a2.output
        do
                a1.output
                a2.output

@@ -41,8 +41,8 @@ end
 
 class Bar
 special Foo
 
 class Bar
 special Foo

-       readable writable attr _a3: Int 
-       redef meth run
+       readable writable var _a3: Int 
+       redef fun run

        do
                a1.output
                a2.output
        do
                a1.output
                a2.output

diff --git a/tests/base_attr_init_val1.nit b/tests/base_attr_init_val1.nit
index f92fdfe..7c42007 100644 (file)
--- a/tests/base_attr_init_val1.nit
+++ b/tests/base_attr_init_val1.nit
@@ -17,12 +17,12 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       readable attr _i: Int = 1
+       readable var _i: Int = 1

        init do end
 end
 
 class B
        init do end
 end
 
 class B

-       readable attr _a: A = new A
+       readable var _a: A = new A

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_attr_init_val2.nit b/tests/base_attr_init_val2.nit
index 4dd716f..9ed6c10 100644 (file)
--- a/tests/base_attr_init_val2.nit
+++ b/tests/base_attr_init_val2.nit
@@ -20,5 +20,5 @@ end
 class Int
 end
 class A
 class Int
 end
 class A

-       attr _i: Int = 1
+       var _i: Int = 1

 end
 end

diff --git a/tests/base_attr_isset.nit b/tests/base_attr_isset.nit
index f4eee62..2b8aed9 100644 (file)
--- a/tests/base_attr_isset.nit
+++ b/tests/base_attr_isset.nit
@@ -20,30 +20,30 @@ interface Object
 end
 
 universal Int
 end
 
 universal Int

-       meth output is intern
-       meth +(o: Int): Int is intern
+       fun output is intern
+       fun +(o: Int): Int is intern

 end
 
 universal Bool
 end
 
 universal Bool

-       meth output is intern
+       fun output is intern

 end
 
 class Integer
 end
 
 class Integer

-       readable writable attr _val: Int
+       readable writable var _val: Int

        init(val: Int) do _val = val
        init(val: Int) do _val = val

-       meth output do _val.output
+       fun output do _val.output

 end
 
 class Foo
 end
 
 class Foo

-       attr _a1: Integer
-       readable attr _a2: Integer
-       meth run
+       var _a1: Integer
+       readable var _a2: Integer
+       fun run

        do
                _a1.output
                a2.output
        end
 
        do
                _a1.output
                a2.output
        end
 

-       meth show(i: Int)
+       fun show(i: Int)

        do
                i.output
                (isset _a1).output
        do
                i.output
                (isset _a1).output

@@ -64,17 +64,17 @@ end
 
 class Bar
 special Foo
 
 class Bar
 special Foo

-       attr _a3: Integer#!alt1# #!alt2#
-       #alt1#attr _a3: Integer = new Integer(9000)
-       #alt2#attr _a3: nullable Integer
-       redef meth run
+       var _a3: Integer#!alt1# #!alt2#
+       #alt1#var _a3: Integer = new Integer(9000)
+       #alt2#var _a3: nullable Integer
+       redef fun run

        do
                _a1.output
                _a2.output
                _a3.output
        end
 
        do
                _a1.output
                _a2.output
                _a3.output
        end
 

-       redef meth show(i)
+       redef fun show(i)

        do
                super
                (isset _a3).output
        do
                super
                (isset _a3).output

diff --git a/tests/base_attr_nullable.nit b/tests/base_attr_nullable.nit
index c8ea25c..8961bbb 100644 (file)
--- a/tests/base_attr_nullable.nit
+++ b/tests/base_attr_nullable.nit
@@ -20,26 +20,26 @@ interface Object
 end
 
 universal Int
 end
 
 universal Int

-       meth output is intern
-       meth +(o: Int): Int is intern
+       fun output is intern
+       fun +(o: Int): Int is intern

 end
 
 class Integer
 end
 
 class Integer

-       readable writable attr _val: Int
+       readable writable var _val: Int

        init(val: Int) do _val = val
        init(val: Int) do _val = val

-       meth output do _val.output
+       fun output do _val.output

 end
 
 class Foo
 end
 
 class Foo

-       attr _a1: Integer
-       readable attr _a2: Integer
-       meth run
+       var _a1: Integer
+       readable var _a2: Integer
+       fun run

        do
                _a1.output
                a2.output
        end
 
        do
                _a1.output
                a2.output
        end
 

-       meth run_other(o: Foo)
+       fun run_other(o: Foo)

        do
                o._a1.output
                o._a2.output
        do
                o._a1.output
                o._a2.output

@@ -58,8 +58,8 @@ end
 
 class Bar
 special Foo
 
 class Bar
 special Foo

-       attr _a3: Integer
-       redef meth run
+       var _a3: Integer
+       redef fun run

        do
                _a1.output
                _a2.output
        do
                _a1.output
                _a2.output

diff --git a/tests/base_attr_nullable_int.nit b/tests/base_attr_nullable_int.nit
index 62e3679..d71916e 100644 (file)
--- a/tests/base_attr_nullable_int.nit
+++ b/tests/base_attr_nullable_int.nit
@@ -20,20 +20,20 @@ interface Object
 end
 
 universal Int
 end
 
 universal Int

-       meth output is intern
-       meth +(o: Int): Int is intern
+       fun output is intern
+       fun +(o: Int): Int is intern

 end
 
 class Foo
 end
 
 class Foo

-       attr _a1: Int
-       readable attr _a2: Int
-       meth run
+       var _a1: Int
+       readable var _a2: Int
+       fun run

        do
                _a1.output
                a2.output
        end
 
        do
                _a1.output
                a2.output
        end
 

-       meth run_other(o: Foo)
+       fun run_other(o: Foo)

        do
                o._a1.output
                o._a2.output
        do
                o._a1.output
                o._a2.output

@@ -52,8 +52,8 @@ end
 
 class Bar
 special Foo
 
 class Bar
 special Foo

-       attr _a3: Int
-       redef meth run
+       var _a3: Int
+       redef fun run

        do
                _a1.output
                _a2.output
        do
                _a1.output
                _a2.output

diff --git a/tests/base_classid.nit b/tests/base_classid.nit
index 5722f61..e98e34e 100644 (file)
--- a/tests/base_classid.nit
+++ b/tests/base_classid.nit
@@ -22,7 +22,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       meth unreasheable
+       fun unreasheable

        do
                var a: A
                a = new B
        do
                var a: A
                a = new B

diff --git a/tests/base_closure1.nit b/tests/base_closure1.nit
index 6995966..27d0f88 100644 (file)
--- a/tests/base_closure1.nit
+++ b/tests/base_closure1.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar
        do
                1.output
                with bar
        do
                1.output

@@ -28,7 +28,7 @@ class A
        end
 end
 
        end
 end
 

-meth work
+fun work

 do
        var a = new A
        a.foo with do #!alt11#
 do
        var a = new A
        a.foo with do #!alt11#

diff --git a/tests/base_closure10.nit b/tests/base_closure10.nit
index 8fb7b33..dd12216 100644 (file)
--- a/tests/base_closure10.nit
+++ b/tests/base_closure10.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
 
 import kernel
 

-meth foo with k
+fun foo with k

 do
        ' '.output
        '<'.output
 do
        ' '.output
        '<'.output

@@ -27,7 +27,7 @@ do
        1.output
 end
 
        1.output
 end
 

-meth test
+fun test

 do
        '<'.output
        0.output
 do
        '<'.output
        0.output

diff --git a/tests/base_closure2.nit b/tests/base_closure2.nit
index 25c59f7..567606b 100644 (file)
--- a/tests/base_closure2.nit
+++ b/tests/base_closure2.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar(i: Int)
        do
                1.output
                with bar(i: Int)
        do
                1.output

@@ -29,7 +29,7 @@ class A
        end
 end
 
        end
 end
 

-meth work
+fun work

 do
        var a = new A
        a.foo with x do #!alt11#
 do
        var a = new A
        a.foo with x do #!alt11#

diff --git a/tests/base_closure3.nit b/tests/base_closure3.nit
index fae34bf..bd731a7 100644 (file)
--- a/tests/base_closure3.nit
+++ b/tests/base_closure3.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo(i, j: Int)
+       fun foo(i, j: Int)

                with bar(k, l: Int, a: A)
        do
                i.output
                with bar(k, l: Int, a: A)
        do
                i.output

diff --git a/tests/base_closure4.nit b/tests/base_closure4.nit
index fb9edfc..4d13fe8 100644 (file)
--- a/tests/base_closure4.nit
+++ b/tests/base_closure4.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar: Int
        do
                1.output
                with bar: Int
        do
                1.output

@@ -28,7 +28,7 @@ class A
        end
 end
 
        end
 end
 

-meth work
+fun work

 do
        var a = new A
        a.foo with do #!alt11#
 do
        var a = new A
        a.foo with do #!alt11#

diff --git a/tests/base_closure5.nit b/tests/base_closure5.nit
index bef65e9..1cce7b4 100644 (file)
--- a/tests/base_closure5.nit
+++ b/tests/base_closure5.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo: Int
+       fun foo: Int

                with bar: Int
        do
                1.output
                with bar: Int
        do
                1.output

@@ -27,7 +27,7 @@ class A
        end
 end
 
        end
 end
 

-meth work: Int
+fun work: Int

 do
        var a = new A
        var i = a.foo with do
 do
        var a = new A
        var i = a.foo with do

diff --git a/tests/base_closure6.nit b/tests/base_closure6.nit
index 48e99cc..660971d 100644 (file)
--- a/tests/base_closure6.nit
+++ b/tests/base_closure6.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo: U
+       fun foo: U

                with bar
        do
                return new U
                with bar
        do
                return new U

diff --git a/tests/base_closure7.nit b/tests/base_closure7.nit
index 56b3c70..fde6f08 100644 (file)
--- a/tests/base_closure7.nit
+++ b/tests/base_closure7.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
 
 import kernel
 

-meth repeat(x: Int)
+fun repeat(x: Int)

        with each(i: Int)
 do
        var c = 0
        with each(i: Int)
 do
        var c = 0

@@ -26,7 +26,7 @@ do
        end
 end
 
        end
 end
 

-meth work
+fun work

 do
        repeat(4) with i do
                i.output
 do
        repeat(4) with i do
                i.output

diff --git a/tests/base_closure8.nit b/tests/base_closure8.nit
index 9043945..9895978 100644 (file)
--- a/tests/base_closure8.nit
+++ b/tests/base_closure8.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo(i: Int)
+       fun foo(i: Int)

                with bar
        do
                '['.output
                with bar
        do
                '['.output

@@ -31,7 +31,7 @@ class A
        end
 end
 
        end
 end
 

-meth start
+fun start

 do
        var a = new A
        0.output
 do
        var a = new A
        0.output

diff --git a/tests/base_closure9.nit b/tests/base_closure9.nit
index d23abb5..a013790 100644 (file)
--- a/tests/base_closure9.nit
+++ b/tests/base_closure9.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth indent(i: Int, j, c: Char)
+       fun indent(i: Int, j, c: Char)

        do
                var ii = i
                while ii > 0 do
        do
                var ii = i
                while ii > 0 do

@@ -30,7 +30,7 @@ class A
                i.output
        end
 
                i.output
        end
 

-       meth foo(i: Int, j: Char)
+       fun foo(i: Int, j: Char)

                with bar
        do
                if i >= 3 then
                with bar
        do
                if i >= 3 then

@@ -54,7 +54,7 @@ class A
        end
 end
 
        end
 end
 

-meth start
+fun start

 do
        var a = new A
        0.output
 do
        var a = new A
        0.output

diff --git a/tests/base_closure_break.nit b/tests/base_closure_break.nit
index 814cf7a..6c0297a 100644 (file)
--- a/tests/base_closure_break.nit
+++ b/tests/base_closure_break.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with break bar #!alt12#
                #alt12#with break bar: Int
        do
                with break bar #!alt12#
                #alt12#with break bar: Int
        do

@@ -29,7 +29,7 @@ class A
        end
 end
 
        end
 end
 

-meth work
+fun work

 do
        var a = new A
        a.foo with do #!alt11#
 do
        var a = new A
        a.foo with do #!alt11#

diff --git a/tests/base_closure_default1.nit b/tests/base_closure_default1.nit
index 0210965..0b34ab2 100644 (file)
--- a/tests/base_closure_default1.nit
+++ b/tests/base_closure_default1.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar do
                        #alt1# return
                        #alt2# return 1
                with bar do
                        #alt1# return
                        #alt2# return 1

diff --git a/tests/base_closure_default2.nit b/tests/base_closure_default2.nit
index 30b5f29..e420327 100644 (file)
--- a/tests/base_closure_default2.nit
+++ b/tests/base_closure_default2.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar(i: Int) do
                        #alt1# return
                        #alt2# return 1
                with bar(i: Int) do
                        #alt1# return
                        #alt2# return 1

diff --git a/tests/base_closure_default3.nit b/tests/base_closure_default3.nit
index 522b39c..d45c397 100644 (file)
--- a/tests/base_closure_default3.nit
+++ b/tests/base_closure_default3.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar: Int do
                        #alt1# return
                        #alt2# return 1
                with bar: Int do
                        #alt1# return
                        #alt2# return 1

diff --git a/tests/base_closure_default4.nit b/tests/base_closure_default4.nit
index 494cebb..8f12ae9 100644 (file)
--- a/tests/base_closure_default4.nit
+++ b/tests/base_closure_default4.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

                with bar(i: Int): Int do
                        #alt1# return
                        #alt2# return -1
                with bar(i: Int): Int do
                        #alt1# return
                        #alt2# return -1

diff --git a/tests/base_closure_multi.nit b/tests/base_closure_multi.nit
index 743a3cf..c0994db 100644 (file)
--- a/tests/base_closure_multi.nit
+++ b/tests/base_closure_multi.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
 
 import kernel
 

-meth a
+fun a

        with a1
        with a2 #!alt1#
 #alt2# with a3
        with a1
        with a2 #!alt1#
 #alt2# with a3

@@ -26,7 +26,7 @@ do
 #alt2# a3
 end
 
 #alt2# a3
 end
 

-meth b
+fun b

        with b1
        with b2
 do
        with b1
        with b2
 do

@@ -34,13 +34,13 @@ do
        b2
 end
 
        b2
 end
 

-meth c
+fun c

        with c1
 do
        c1
 end
 
        with c1
 do
        c1
 end
 

-meth d
+fun d

        with d1
        with d2
        with d3
        with d1
        with d2
        with d3

diff --git a/tests/base_closure_raf.nit b/tests/base_closure_raf.nit
index 01e49c0..64a513c 100644 (file)
--- a/tests/base_closure_raf.nit
+++ b/tests/base_closure_raf.nit
@@ -18,7 +18,7 @@ import base_closure2
 
 class B
 special A
 
 class B
 special A

-       redef meth foo
+       redef fun foo

                with bar(i: Int) #!alt13# #!alt14# #!alt15#
                #alt13# with bar
                #alt14# with bar(b: Bool)
                with bar(i: Int) #!alt13# #!alt14# #!alt15#
                #alt13# with bar
                #alt14# with bar(b: Bool)

@@ -33,7 +33,7 @@ special A
        end
 end
 
        end
 end
 

-meth work2
+fun work2

 do
        var a: A = new B
        a.foo with x do #!alt11#
 do
        var a: A = new B
        a.foo with x do #!alt11#

diff --git a/tests/base_compile.nit b/tests/base_compile.nit
index eac166d..cd9061c 100644 (file)
--- a/tests/base_compile.nit
+++ b/tests/base_compile.nit
@@ -17,25 +17,25 @@
 import kernel
 
 class Client
 import kernel
 
 class Client

-       attr _budjet: Int # 
-       meth regarde(t: Tableau)
+       var _budjet: Int # 
+       fun regarde(t: Tableau)

        do
                if t.joli and dans_mes_moyens(t.etiquette.prix) then
                        achette(t)
                end
        end
        do
                if t.joli and dans_mes_moyens(t.etiquette.prix) then
                        achette(t)
                end
        end

-       meth achette(t: Tableau) is abstract
-       meth dans_mes_moyens(i: Int): Bool
+       fun achette(t: Tableau) is abstract
+       fun dans_mes_moyens(i: Int): Bool

        do
                return i < _budjet
        end
 end
 
 class Tableau
        do
                return i < _budjet
        end
 end
 
 class Tableau

-       meth joli: Bool is abstract
-       meth etiquette: Etiquette is abstract
+       fun joli: Bool is abstract
+       fun etiquette: Etiquette is abstract

 end
 
 class Etiquette
 end
 
 class Etiquette

-       meth prix: Int is abstract
+       fun prix: Int is abstract

 end
 end

diff --git a/tests/base_control_flow.nit b/tests/base_control_flow.nit
index 95182c0..b7684d8 100644 (file)
--- a/tests/base_control_flow.nit
+++ b/tests/base_control_flow.nit
@@ -16,14 +16,14 @@
 
 import kernel
 
 
 import kernel
 

-meth a: Int
+fun a: Int

 do
        a
        return 0
        a
 end
 
 do
        a
        return 0
        a
 end
 

-meth b: Int
+fun b: Int

 do
        a
        if true then return 0
 do
        a
        if true then return 0

@@ -31,7 +31,7 @@ do
        return 1#!alt1#
 end
 
        return 1#!alt1#
 end
 

-meth c: Int
+fun c: Int

 do
        a
        if true then
 do
        a
        if true then

@@ -43,7 +43,7 @@ do
        return 2#!alt1#
 end
 
        return 2#!alt1#
 end
 

-meth d: Int
+fun d: Int

 do
        a
        if true then
 do
        a
        if true then

diff --git a/tests/base_control_flow2.nit b/tests/base_control_flow2.nit
index a2b1185..f8d32ea 100644 (file)
--- a/tests/base_control_flow2.nit
+++ b/tests/base_control_flow2.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
 
 import kernel
 

-meth a do end
+fun a do end

 
 while true do
        a
 
 while true do
        a

diff --git a/tests/base_eq.nit b/tests/base_eq.nit
index 0b0a618..5ec38e5 100644 (file)
--- a/tests/base_eq.nit
+++ b/tests/base_eq.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       readable attr _a: Int 
+       readable var _a: Int 

        
        init(a: Int)
        do
        
        init(a: Int)
        do

@@ -27,7 +27,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth ==(a: nullable Object): Bool
+       redef fun ==(a: nullable Object): Bool

        do
                if not a isa B then
                        return false
        do
                if not a isa B then
                        return false

diff --git a/tests/base_eq_null_notnull.nit b/tests/base_eq_null_notnull.nit
index 67af307..b684a09 100644 (file)
--- a/tests/base_eq_null_notnull.nit
+++ b/tests/base_eq_null_notnull.nit
@@ -17,13 +17,13 @@
 import end
 
 class Object
 import end
 
 class Object

-       meth ==(o: nullable Object): Bool do return self is o
-       meth !=(o: nullable Object): Bool do return not (self == o)
-       meth output is intern
+       fun ==(o: nullable Object): Bool do return self is o
+       fun !=(o: nullable Object): Bool do return not (self == o)
+       fun output is intern

 end
 
 class Bool
 end
 
 class Bool

-       redef meth output is intern
+       redef fun output is intern

 end
 
 class A
 end
 
 class A

diff --git a/tests/base_gen.nit b/tests/base_gen.nit
index 3980ad4..454c6e4 100644 (file)
--- a/tests/base_gen.nit
+++ b/tests/base_gen.nit
@@ -17,7 +17,7 @@
 import end
 
 class Object
 import end
 
 class Object

-       meth i_to_s(i: Int)
+       fun i_to_s(i: Int)

        do
                i.output
        end
        do
                i.output
        end

@@ -28,13 +28,13 @@ class A
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
-       meth +(i: Int): Int is intern
+       fun output is intern
+       fun +(i: Int): Int is intern

 end
 
 class B
 special A
 end
 
 class B
 special A

-       redef meth i_to_s(i: Int)
+       redef fun i_to_s(i: Int)

        do
                (i+1).output
        end
        do
                (i+1).output
        end

@@ -43,7 +43,7 @@ special A
 end
 
 class G[E: Object]
 end
 
 class G[E: Object]

-       meth i_to_s2(a: E, i: Int)
+       fun i_to_s2(a: E, i: Int)

        do
                a.i_to_s(i)
        end
        do
                a.i_to_s(i)
        end

diff --git a/tests/base_gen_f.nit b/tests/base_gen_f.nit
index 57d0c70..66ca5c6 100644 (file)
--- a/tests/base_gen_f.nit
+++ b/tests/base_gen_f.nit
@@ -17,16 +17,16 @@
 import kernel
 
 class G[E: G[E]]
 import kernel
 
 class G[E: G[E]]

-       meth ide(e: E): E
+       fun ide(e: E): E

        do
                return e
        end
        do
                return e
        end

-       meth foo is abstract
+       fun foo is abstract

 end
 
 class G1
 special G[G1]
 end
 
 class G1
 special G[G1]

-       redef meth foo
+       redef fun foo

        do
                1.output
        end
        do
                1.output
        end

@@ -36,7 +36,7 @@ end
 
 class G2
 special G[G2]
 
 class G2
 special G[G2]

-       redef meth foo
+       redef fun foo

        do
                2.output
        end
        do
                2.output
        end

diff --git a/tests/base_gen_int.nit b/tests/base_gen_int.nit
index 2165e0f..4a16599 100644 (file)
--- a/tests/base_gen_int.nit
+++ b/tests/base_gen_int.nit
@@ -17,7 +17,7 @@
 import end
 
 class Object
 import end
 
 class Object

-       meth i_to_s(i: Int)
+       fun i_to_s(i: Int)

        do
                i.output
        end
        do
                i.output
        end

@@ -28,16 +28,16 @@ class A
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
-       meth +(i: Int): Int is intern
-       redef meth i_to_s(i: Int)
+       fun output is intern
+       fun +(i: Int): Int is intern
+       redef fun i_to_s(i: Int)

        do
                (self+i).output
        end
 end
 
 class G[E: Object]
        do
                (self+i).output
        end
 end
 
 class G[E: Object]

-       meth i_to_s2(a: E, i: Int)
+       fun i_to_s2(a: E, i: Int)

        do
                a.i_to_s(i)
        end
        do
                a.i_to_s(i)
        end

diff --git a/tests/base_if_expr.nit b/tests/base_if_expr.nit
index 9a5e117..d9ac92d 100644 (file)
--- a/tests/base_if_expr.nit
+++ b/tests/base_if_expr.nit
@@ -18,10 +18,10 @@ import kernel
 
 class A
        init do end
 
 class A
        init do end

-       redef meth output do 'A'.output
+       redef fun output do 'A'.output

 end
 
 end
 

-meth max(a: Int, b: Int): Int do return if a > b then a else b
+fun max(a: Int, b: Int): Int do return if a > b then a else b

 
 var x = if true then 1 else 0
 x.output
 
 var x = if true then 1 else 0
 x.output

diff --git a/tests/base_init_auto.nit b/tests/base_init_auto.nit
index e1b8be9..655caf4 100644 (file)
--- a/tests/base_init_auto.nit
+++ b/tests/base_init_auto.nit
@@ -17,13 +17,13 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       readable attr _x: Int #!alt1#
-       #alt1#readable attr _x: Int = 2
-       readable attr _y: Int = -2 #!alt2#
-       #alt2#readable attr _y: Int
+       readable var _x: Int #!alt1#
+       #alt1#readable var _x: Int = 2
+       readable var _y: Int = -2 #!alt2#
+       #alt2#readable var _y: Int

        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx
        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx

-       meth work
+       fun work

        do
                _x.output
                _y.output
        do
                _x.output
                _y.output

diff --git a/tests/base_init_inherit.nit b/tests/base_init_inherit.nit
index 9424272..b6738e7 100644 (file)
--- a/tests/base_init_inherit.nit
+++ b/tests/base_init_inherit.nit
@@ -12,7 +12,7 @@ class A
                '2'.output
        end
 
                '2'.output
        end
 

-       meth foo
+       fun foo

        do
                'a'.output
                '\n'.output
        do
                'a'.output
                '\n'.output

@@ -29,7 +29,7 @@ special A
                '}'.output
        end
 
                '}'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                super
        do
                'b'.output
                super

@@ -46,7 +46,7 @@ special B
                '}'.output
        end
 
                '}'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'c'.output
                super
        do
                'c'.output
                super

@@ -55,7 +55,7 @@ end
 
 class M
 special A
 
 class M
 special A

-       redef meth foo
+       redef fun foo

        do
                'm'.output
                super
        do
                'm'.output
                super

@@ -65,7 +65,7 @@ end
 class N
 special B
 special M
 class N
 special B
 special M

-       redef meth foo
+       redef fun foo

        do
                'n'.output
                super
        do
                'n'.output
                super

@@ -82,7 +82,7 @@ special C
                cc
                '}'.output
        end
                cc
                '}'.output
        end

-       redef meth foo
+       redef fun foo

        do
                'o'.output
                super
        do
                'o'.output
                super

diff --git a/tests/base_init_inherit2.nit b/tests/base_init_inherit2.nit
index 8265995..d8e1fcf 100644 (file)
--- a/tests/base_init_inherit2.nit
+++ b/tests/base_init_inherit2.nit
@@ -6,7 +6,7 @@ class A
                'A'.output
        end
 
                'A'.output
        end
 

-       meth foo
+       fun foo

        do
                'a'.output
                '\n'.output
        do
                'a'.output
                '\n'.output

@@ -31,7 +31,7 @@ special A
 #alt3#         '}'.output
 #alt3# end
 
 #alt3#         '}'.output
 #alt3# end
 

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                super
        do
                'b'.output
                super

@@ -56,7 +56,7 @@ special A
 #alt3#         '}'.output
 #alt3# end
 
 #alt3#         '}'.output
 #alt3# end
 

-       redef meth foo
+       redef fun foo

        do
                'c'.output
                super
        do
                'c'.output
                super

@@ -65,7 +65,7 @@ end
 
 class M
 special C
 
 class M
 special C

-       redef meth foo
+       redef fun foo

        do
                'm'.output
                super
        do
                'm'.output
                super

@@ -75,7 +75,7 @@ end
 class N
 special B
 special M
 class N
 special B
 special M

-       redef meth foo
+       redef fun foo

        do
                'n'.output
                super
        do
                'n'.output
                super

diff --git a/tests/base_init_inherit3.nit b/tests/base_init_inherit3.nit
index 552e2c6..1240768 100644 (file)
--- a/tests/base_init_inherit3.nit
+++ b/tests/base_init_inherit3.nit
@@ -6,7 +6,7 @@ class A
                'A'.output
        end
 
                'A'.output
        end
 

-       meth foo
+       fun foo

        do
                'a'.output
                '\n'.output
        do
                'a'.output
                '\n'.output

@@ -15,7 +15,7 @@ end
 
 class M
 special A
 
 class M
 special A

-       redef meth foo
+       redef fun foo

        do
                'm'.output
                super
        do
                'm'.output
                super

@@ -32,7 +32,7 @@ special A
                '}'.output
        end
 
                '}'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                super
        do
                'b'.output
                super

@@ -41,7 +41,7 @@ end
 
 class N
 special A
 
 class N
 special A

-       redef meth foo
+       redef fun foo

        do
                'n'.output
                super
        do
                'n'.output
                super

@@ -51,7 +51,7 @@ end
 class O
 special M
 special B
 class O
 special M
 special B

-       redef meth foo
+       redef fun foo

        do
                'o'.output
                super
        do
                'o'.output
                super

@@ -61,7 +61,7 @@ end
 class P
 special B
 special N
 class P
 special B
 special N

-       redef meth foo
+       redef fun foo

        do
                'p'.output
                super
        do
                'p'.output
                super

@@ -81,7 +81,7 @@ class Q
        
 #alt3#special O
 #alt3#special P
        
 #alt3#special O
 #alt3#special P

-       redef meth foo
+       redef fun foo

        do
                'q'.output
                super
        do
                'q'.output
                super

diff --git a/tests/base_init_inherit4.nit b/tests/base_init_inherit4.nit
index f269809..1fe6773 100644 (file)
--- a/tests/base_init_inherit4.nit
+++ b/tests/base_init_inherit4.nit
@@ -2,7 +2,7 @@ import kernel
 
 redef interface Object
 
 
 redef interface Object
 

-       meth foo
+       fun foo

        do
                'a'.output
                '\n'.output
        do
                'a'.output
                '\n'.output

@@ -10,7 +10,7 @@ redef interface Object
 end
 
 interface M
 end
 
 interface M

-       redef meth foo
+       redef fun foo

        do
                'm'.output
                super
        do
                'm'.output
                super

@@ -23,7 +23,7 @@ class B
                'B'.output
        end
 
                'B'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                super
        do
                'b'.output
                super

@@ -31,7 +31,7 @@ class B
 end
 
 interface N
 end
 
 interface N

-       redef meth foo
+       redef fun foo

        do
                'n'.output
                super
        do
                'n'.output
                super

@@ -41,7 +41,7 @@ end
 class O
 special M
 special B
 class O
 special M
 special B

-       redef meth foo
+       redef fun foo

        do
                'o'.output
                super
        do
                'o'.output
                super

@@ -51,7 +51,7 @@ end
 class P
 special B
 special N
 class P
 special B
 special N

-       redef meth foo
+       redef fun foo

        do
                'p'.output
                super
        do
                'p'.output
                super

@@ -71,7 +71,7 @@ class Q
        
 #alt3#special O
 #alt3#special P
        
 #alt3#special O
 #alt3#special P

-       redef meth foo
+       redef fun foo

        do
                'q'.output
                super
        do
                'q'.output
                super

diff --git a/tests/base_init_inherit5.nit b/tests/base_init_inherit5.nit
index e833b51..82f83b2 100644 (file)
--- a/tests/base_init_inherit5.nit
+++ b/tests/base_init_inherit5.nit
@@ -7,7 +7,7 @@ class A
                a.output
        end
 
                a.output
        end
 

-       meth foo
+       fun foo

        do
                'a'.output
                '\n'.output
        do
                'a'.output
                '\n'.output

@@ -25,7 +25,7 @@ special A
                '}'.output
        end
 
                '}'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                super
        do
                'b'.output
                super

@@ -43,7 +43,7 @@ special B
                '}'.output
        end
 
                '}'.output
        end
 

-       redef meth foo
+       redef fun foo

        do
                'c'.output
                super
        do
                'c'.output
                super

@@ -52,7 +52,7 @@ end
 
 class M
 special A
 
 class M
 special A

-       redef meth foo
+       redef fun foo

        do
                'm'.output
                super
        do
                'm'.output
                super

@@ -62,7 +62,7 @@ end
 class N
 special B
 special M
 class N
 special B
 special M

-       redef meth foo
+       redef fun foo

        do
                'n'.output
                super
        do
                'n'.output
                super

@@ -80,7 +80,7 @@ special C
                cc(a,b,c)
                '}'.output
        end
                cc(a,b,c)
                '}'.output
        end

-       redef meth foo
+       redef fun foo

        do
                'o'.output
                super
        do
                'o'.output
                super

diff --git a/tests/base_init_linext.nit b/tests/base_init_linext.nit
index 010e1ab..51460df 100644 (file)
--- a/tests/base_init_linext.nit
+++ b/tests/base_init_linext.nit
@@ -22,7 +22,7 @@ class A
                ' '.output
        end
        init inita do init
                ' '.output
        end
        init inita do init

-       meth work do '\n'.output
+       fun work do '\n'.output

 end
 
 class B
 end
 
 class B

diff --git a/tests/base_init_linext2.nit b/tests/base_init_linext2.nit
index 3eb7e62..ae301ec 100644 (file)
--- a/tests/base_init_linext2.nit
+++ b/tests/base_init_linext2.nit
@@ -33,7 +33,7 @@ class A
                c.output
                ' '.output
        end
                c.output
                ' '.output
        end

-       meth work do '\n'.output
+       fun work do '\n'.output

 end
 
 class B
 end
 
 class B

diff --git a/tests/base_init_simple.nit b/tests/base_init_simple.nit
index bab4c7d..2872514 100644 (file)
--- a/tests/base_init_simple.nit
+++ b/tests/base_init_simple.nit
@@ -3,7 +3,7 @@ import kernel
 class A
        init do 'A'.output
        init init2 do 'a'.output
 class A
        init do 'A'.output
        init init2 do 'a'.output

-       meth foo do '\n'.output
+       fun foo do '\n'.output

 end
 
 class B
 end
 
 class B

diff --git a/tests/base_int.nit b/tests/base_int.nit
index b6cdbe5..5d9007c 100644 (file)
--- a/tests/base_int.nit
+++ b/tests/base_int.nit
@@ -17,7 +17,7 @@
 import kernel
 
 redef class Object
 import kernel
 
 redef class Object

-       meth printn(a: Object)
+       fun printn(a: Object)

        do
                if a == null then
                        'n'.output
        do
                if a == null then
                        'n'.output

diff --git a/tests/base_isa_cast.nit b/tests/base_isa_cast.nit
index 9a0adc5..816cb39 100644 (file)
--- a/tests/base_isa_cast.nit
+++ b/tests/base_isa_cast.nit
@@ -21,12 +21,12 @@ class A
 end
 class B
 special A
 end
 class B
 special A

-       meth foo do 0.output
+       fun foo do 0.output

        init do end
 end
 class C
 special B
        init do end
 end
 class C
 special B

-       meth bar do 1.output
+       fun bar do 1.output

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_isa_cast2.nit b/tests/base_isa_cast2.nit
index ca13a66..1551ac3 100644 (file)
--- a/tests/base_isa_cast2.nit
+++ b/tests/base_isa_cast2.nit
@@ -22,7 +22,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       meth foo(i: Int) do i.output
+       fun foo(i: Int) do i.output

        init do end
 end
 var a0: A = new B
        init do end
 end
 var a0: A = new B

diff --git a/tests/base_isa_cast3.nit b/tests/base_isa_cast3.nit
index 2f80084..533ad77 100644 (file)
--- a/tests/base_isa_cast3.nit
+++ b/tests/base_isa_cast3.nit
@@ -21,8 +21,8 @@ class A
 end
 class B
 special A
 end
 class B
 special A

-       meth foo(i: Int) do i.output
-       meth bar: Bool do return true
+       fun foo(i: Int) do i.output
+       fun bar: Bool do return true

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_isa_cast4.nit b/tests/base_isa_cast4.nit
index 9104a90..ebc1a27 100644 (file)
--- a/tests/base_isa_cast4.nit
+++ b/tests/base_isa_cast4.nit
@@ -22,11 +22,11 @@ end
 
 class B
 special A
 
 class B
 special A

-       meth foo(i: Int) do i.output
+       fun foo(i: Int) do i.output

        init do end
 end
 
        init do end
 end
 

-meth maybe: Bool do return true
+fun maybe: Bool do return true

 
 var a: A = new B
 
 
 var a: A = new B
 

diff --git a/tests/base_isa_cast_self.nit b/tests/base_isa_cast_self.nit
index 1bb78f4..c251d40 100644 (file)
--- a/tests/base_isa_cast_self.nit
+++ b/tests/base_isa_cast_self.nit
@@ -19,7 +19,7 @@ import kernel
 class A
        init do end
 
 class A
        init do end
 

-       meth work
+       fun work

        do
                if self isa B then
                        foo
        do
                if self isa B then
                        foo

@@ -48,13 +48,13 @@ end
 
 class B
 special A
 
 class B
 special A

-       meth foo do 0.output
+       fun foo do 0.output

        init do end
 end
 
 class C
 special B
        init do end
 end
 
 class C
 special B

-       meth bar do 1.output
+       fun bar do 1.output

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_meth_call.nit b/tests/base_meth_call.nit
index aa35116..9f603bc 100644 (file)
--- a/tests/base_meth_call.nit
+++ b/tests/base_meth_call.nit
@@ -17,14 +17,14 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo(a: Int) do a.output
-       meth bar(a: Int): Int do
+       fun foo(a: Int) do a.output
+       fun bar(a: Int): Int do

                ' '.output
                a.output
                return a
        end
 
                ' '.output
                a.output
                return a
        end
 

-       meth baz do
+       fun baz do

                foo(1)
                bar(2).output
                var i = bar(3)
                foo(1)
                bar(2).output
                var i = bar(3)

diff --git a/tests/base_nullable.nit b/tests/base_nullable.nit
index 12c36b9..d4cdefe 100644 (file)
--- a/tests/base_nullable.nit
+++ b/tests/base_nullable.nit
@@ -17,9 +17,9 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       attr _i: Int
+       var _i: Int

        init (i: Int) do _i = i
        init (i: Int) do _i = i

-       redef meth output do _i.output
+       redef fun output do _i.output

 end
 
 var a: A
 end
 
 var a: A

diff --git a/tests/base_primitive.nit b/tests/base_primitive.nit
index 396f0d2..8b64c56 100644 (file)
--- a/tests/base_primitive.nit
+++ b/tests/base_primitive.nit
@@ -17,25 +17,25 @@
 import kernel
 
 redef class Object
 import kernel
 
 redef class Object

-       meth foo(i: Int)
+       fun foo(i: Int)

        do
                0.output
        end
 end
 
 redef class Int
        do
                0.output
        end
 end
 
 redef class Int

-       redef meth foo(i: Int)
+       redef fun foo(i: Int)

        do
                (-i).output
        end
 end
 
 class A
        do
                (-i).output
        end
 end
 
 class A

-       redef meth foo(i: Int)
+       redef fun foo(i: Int)

        do
                i.output
        end
        do
                i.output
        end

-       meth bar(i: Int)
+       fun bar(i: Int)

        do
                (i*10).output
        end
        do
                (i*10).output
        end

@@ -45,7 +45,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth bar(i: Int)
+       redef fun bar(i: Int)

        do
                (i*100).output
        end
        do
                (i*100).output
        end

diff --git a/tests/base_primitive_null.nit b/tests/base_primitive_null.nit
index 667a212..6961e6d 100644 (file)
--- a/tests/base_primitive_null.nit
+++ b/tests/base_primitive_null.nit
@@ -17,9 +17,9 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       attr _i: Int
-       attr _b: Bool
-       attr _c: Char
+       var _i: Int
+       var _b: Bool
+       var _c: Char

 
        init
        do
 
        init
        do

diff --git a/tests/base_prot.nit b/tests/base_prot.nit
index f7eba89..c7e2930 100644 (file)
--- a/tests/base_prot.nit
+++ b/tests/base_prot.nit
@@ -17,14 +17,14 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth pub do 0.output
-       protected meth pro do 1.output
-       private meth pri do 2.output
+       fun pub do 0.output
+       protected fun pro do 1.output
+       private fun pri do 2.output

        init do end
 end
 
 class O1
        init do end
 end
 
 class O1

-       meth o
+       fun o

        do
                var a = new A
                a.pub
        do
                var a = new A
                a.pub

diff --git a/tests/base_prot2.nit b/tests/base_prot2.nit
index 02d15e5..15226d8 100644 (file)
--- a/tests/base_prot2.nit
+++ b/tests/base_prot2.nit
@@ -18,7 +18,7 @@ private import base_prot
 
 class A2
 special A
 
 class A2
 special A

-       meth o
+       fun o

        do
                pub
                pro
        do
                pub
                pro

@@ -28,7 +28,7 @@ special A
 end
 
 class O2
 end
 
 class O2

-       meth o
+       fun o

        do
                var a = new A
                a.pub
        do
                var a = new A
                a.pub

diff --git a/tests/base_prot3.nit b/tests/base_prot3.nit
index 3f70aee..df87cd0 100644 (file)
--- a/tests/base_prot3.nit
+++ b/tests/base_prot3.nit
@@ -18,7 +18,7 @@ private import base_prot2
 intrude import base_prot
 
 class O3
 intrude import base_prot
 
 class O3

-       meth o
+       fun o

        do
                var a = new A
                a.pub
        do
                var a = new A
                a.pub

diff --git a/tests/base_sig_inh.nit b/tests/base_sig_inh.nit
index ab04209..cc0bc43 100644 (file)
--- a/tests/base_sig_inh.nit
+++ b/tests/base_sig_inh.nit
@@ -17,28 +17,28 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth f0 is abstract
-       meth f1(a,b: Int) is abstract 
-       meth f2(a,b: Int) is abstract
-       meth f3(a,b: Int): Int is abstract
-       meth f4: Int is abstract
+       fun f0 is abstract
+       fun f1(a,b: Int) is abstract 
+       fun f2(a,b: Int) is abstract
+       fun f3(a,b: Int): Int is abstract
+       fun f4: Int is abstract

 end
 
 class B
 special A
 end
 
 class B
 special A

-       redef meth f0 do 0.output
-       redef meth f1(a: Int, b: Int) do (a+b).output
-       redef meth f2(a,b) do (a+b).output
-       redef meth f3(a,b) do return a+b
-       redef meth f4 do return 4
+       redef fun f0 do 0.output
+       redef fun f1(a: Int, b: Int) do (a+b).output
+       redef fun f2(a,b) do (a+b).output
+       redef fun f3(a,b) do return a+b
+       redef fun f4 do return 4

        init do end
 end
 
 
        init do end
 end
 
 

-meth m1 do 1.output
-meth m2(a:Int) do a.output
-meth m3(a,b:Int) do (a+b).output
-#alt1#meth e1(a,b:Int...) do (a.first).output
+fun m1 do 1.output
+fun m2(a:Int) do a.output
+fun m3(a,b:Int) do (a+b).output
+#alt1#fun e1(a,b:Int...) do (a.first).output

 
 m1
 m2(2)
 
 m1
 m2(2)

diff --git a/tests/base_simple.nit b/tests/base_simple.nit
index 885fd8a..eca7e08 100644 (file)
--- a/tests/base_simple.nit
+++ b/tests/base_simple.nit
@@ -20,16 +20,16 @@ class Object
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
+       fun output is intern

 end
 
 class A
 end
 
 class A

-       meth foo(i: Int)
+       fun foo(i: Int)

        do
                i.output
                i.output
        end
        do
                i.output
                i.output
        end

-       meth bar(i: Int)
+       fun bar(i: Int)

        do
                0.output
        end
        do
                0.output
        end

@@ -41,13 +41,13 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth bar(i: Int)
+       redef fun bar(i: Int)

        do
                i.output
                i.output
                i.output
        end
        do
                i.output
                i.output
                i.output
        end

-       meth this_is_a_dead_method
+       fun this_is_a_dead_method

        do
                0.output
        end
        do
                0.output
        end

diff --git a/tests/base_simple2.nit b/tests/base_simple2.nit
index 5d2df41..9796cff 100644 (file)
--- a/tests/base_simple2.nit
+++ b/tests/base_simple2.nit
@@ -20,20 +20,20 @@ class Object
 end
 
 class Int
 end
 
 class Int

-       meth output is intern
+       fun output is intern

 end
 
 class A
 end
 
 class A

-       meth foo(i: Int)
+       fun foo(i: Int)

        do
                i.output
                i.output
        end
        do
                i.output
                i.output
        end

-       meth bar(i: Int)
+       fun bar(i: Int)

        do
                0.output
        end
        do
                0.output
        end

-       meth baz(a: A)
+       fun baz(a: A)

        do
                0.output
        end
        do
                0.output
        end

@@ -45,19 +45,19 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth bar(i: Int)
+       redef fun bar(i: Int)

        do
                i.output
                i.output
                i.output
        end
 
        do
                i.output
                i.output
                i.output
        end
 

-       redef meth baz(a: A)
+       redef fun baz(a: A)

        do
                4.output
        end
 
        do
                4.output
        end
 

-       meth this_is_a_dead_method
+       fun this_is_a_dead_method

        do
                0.output
        end
        do
                0.output
        end

@@ -69,7 +69,7 @@ special A
 end
 
 class Sys
 end
 
 class Sys

-       meth foo(a: A)
+       fun foo(a: A)

        do
                a.baz(a)
        end
        do
                a.baz(a)
        end

diff --git a/tests/base_super_linext.nit b/tests/base_super_linext.nit
index f4da116..b6bea33 100644 (file)
--- a/tests/base_super_linext.nit
+++ b/tests/base_super_linext.nit
@@ -17,27 +17,27 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth work do
+       fun work do

                foo
                '\n'.output
                bar.output
                '\n'.output
        end
                foo
                '\n'.output
                bar.output
                '\n'.output
        end

-       meth foo do 'A'.output
-       meth bar: Char do return 'A'
+       fun foo do 'A'.output
+       fun bar: Char do return 'A'

        init do end
 end
 
 class B
 special A
        init do end
 end
 
 class B
 special A

-       redef meth foo
+       redef fun foo

        do
                'B'.output
                '['.output
                super
                ']'.output
        end
        do
                'B'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'B'
        do 
                super.output
                return 'B'

@@ -47,14 +47,14 @@ end
 
 class C
 special A
 
 class C
 special A

-       redef meth foo
+       redef fun foo

        do
                'C'.output
                '['.output
                super
                ']'.output
        end
        do
                'C'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'C'
        do 
                super.output
                return 'C'

@@ -65,14 +65,14 @@ end
 class D
 special B
 special C
 class D
 special B
 special C

-       redef meth foo
+       redef fun foo

        do
                'D'.output
                '['.output
                super
                ']'.output
        end
        do
                'D'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'D'
        do 
                super.output
                return 'D'

diff --git a/tests/base_super_linext_raf.nit b/tests/base_super_linext_raf.nit
index 6f8fb74..beb82da 100644 (file)
--- a/tests/base_super_linext_raf.nit
+++ b/tests/base_super_linext_raf.nit
@@ -17,14 +17,14 @@
 import base_super_linext
 
 redef class A
 import base_super_linext
 
 redef class A

-       redef meth foo
+       redef fun foo

        do
                'a'.output
                '['.output
                super
                ']'.output
        end
        do
                'a'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'a'
        do 
                super.output
                return 'a'

@@ -32,14 +32,14 @@ redef class A
 end
 
 redef class B
 end
 
 redef class B

-       redef meth foo
+       redef fun foo

        do
                'b'.output
                '['.output
                super
                ']'.output
        end
        do
                'b'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'b'
        do 
                super.output
                return 'b'

@@ -47,14 +47,14 @@ redef class B
 end
 
 redef class C
 end
 
 redef class C

-       redef meth foo
+       redef fun foo

        do
                'c'.output
                '['.output
                super
                ']'.output
        end
        do
                'c'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'c'
        do 
                super.output
                return 'c'

@@ -62,14 +62,14 @@ redef class C
 end
 
 redef class D
 end
 
 redef class D

-       redef meth foo
+       redef fun foo

        do
                'd'.output
                '['.output
                super
                ']'.output
        end
        do
                'd'.output
                '['.output
                super
                ']'.output
        end

-       redef meth bar
+       redef fun bar

        do 
                super.output
                return 'd'
        do 
                super.output
                return 'd'

diff --git a/tests/base_var.nit b/tests/base_var.nit
index ed93ee2..e37284b 100644 (file)
--- a/tests/base_var.nit
+++ b/tests/base_var.nit
@@ -16,8 +16,8 @@
 
 import kernel
 
 
 import kernel
 

-meth foo: Int do return 1
-meth bar do end
+fun foo: Int do return 1
+fun bar do end

 
 var a1: Int
 var b1: Float
 
 var a1: Int
 var b1: Float

diff --git a/tests/base_var_assignment_flow.nit b/tests/base_var_assignment_flow.nit
index a05a167..bd0be76 100644 (file)
--- a/tests/base_var_assignment_flow.nit
+++ b/tests/base_var_assignment_flow.nit
@@ -17,18 +17,18 @@
 import end
 
 interface Object
 import end
 
 interface Object

-       meth output is abstract
+       fun output is abstract

 end
 
 universal Int
 end
 
 universal Int

-       redef meth output is intern
+       redef fun output is intern

 end
 
 universal Bool
 end
 
 universal Bool

-       redef meth output is intern
+       redef fun output is intern

 end
 
 end
 

-meth maybe: Bool do return false
+fun maybe: Bool do return false

 
 var a: Object
 #alt1#a.output
 
 var a: Object
 #alt1#a.output

diff --git a/tests/base_virtual_type.nit b/tests/base_virtual_type.nit
index 87dec55..ec68f06 100644 (file)
--- a/tests/base_virtual_type.nit
+++ b/tests/base_virtual_type.nit
@@ -19,7 +19,7 @@ import kernel
 class A
        type E: T
        
 class A
        type E: T
        

-       readable writable attr _e: nullable E = null 
+       readable writable var _e: nullable E = null 

 end
 
 class B
 end
 
 class B

@@ -28,7 +28,7 @@ special A
 end
 
 class T
 end
 
 class T

-       meth foo do 0.output
+       fun foo do 0.output

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_virtual_type2.nit b/tests/base_virtual_type2.nit
index a5cfaf9..b2fdef8 100644 (file)
--- a/tests/base_virtual_type2.nit
+++ b/tests/base_virtual_type2.nit
@@ -19,7 +19,7 @@ import kernel
 class A
        type E: T
        
 class A
        type E: T
        

-       readable writable attr _e: nullable E = null
+       readable writable var _e: nullable E = null

 end
 
 class B
 end
 
 class B

@@ -28,13 +28,13 @@ special A
 end
 
 class T
 end
 
 class T

-       meth foo do 0.output
+       fun foo do 0.output

        init do end
 end
 
 class U
 special T
        init do end
 end
 
 class U
 special T

-       redef meth foo do 1.output
+       redef fun foo do 1.output

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_virtual_type3.nit b/tests/base_virtual_type3.nit
index f66f1fa..e8df582 100644 (file)
--- a/tests/base_virtual_type3.nit
+++ b/tests/base_virtual_type3.nit
@@ -19,7 +19,7 @@ import array
 
 class C
 special A
 
 class C
 special A

-       readable writable attr _tab: nullable Array[E]
+       readable writable var _tab: nullable Array[E]

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_virtual_type6.nit b/tests/base_virtual_type6.nit
index 94b4c28..457f873 100644 (file)
--- a/tests/base_virtual_type6.nit
+++ b/tests/base_virtual_type6.nit
@@ -20,9 +20,9 @@ class G[E]
        type F: E
        type F2: F
 
        type F: E
        type F2: F
 

-       readable writable attr _e: E
-       readable writable attr _f: F
-       readable writable attr _f2: F2
+       readable writable var _e: E
+       readable writable var _f: F
+       readable writable var _f2: F2

 
        init(e: E, f: F, f2: F2)
        do
 
        init(e: E, f: F, f2: F2)
        do

diff --git a/tests/base_virtual_type7.nit b/tests/base_virtual_type7.nit
index 6587249..bde4a77 100644 (file)
--- a/tests/base_virtual_type7.nit
+++ b/tests/base_virtual_type7.nit
@@ -19,7 +19,7 @@ import kernel
 class A
        type E: F
        type F: E
 class A
        type E: F
        type F: E

-       readable writable attr _e: nullable E = null
+       readable writable var _e: nullable E = null

        init do end
 end
 
        init do end
 end
 

diff --git a/tests/base_virtual_type_self.nit b/tests/base_virtual_type_self.nit
index f9803a6..7d2633c 100644 (file)
--- a/tests/base_virtual_type_self.nit
+++ b/tests/base_virtual_type_self.nit
@@ -18,11 +18,11 @@ import kernel
 
 class A[E]
        type T: E
 
 class A[E]
        type T: E

-       attr _t: T
-       meth foo(t: T) do end
-       meth foo2: T do return _t
-       meth bar(t: A[T]) do end
-       meth bar2: A[T] do return self
+       var _t: T
+       fun foo(t: T) do end
+       fun foo2: T do return _t
+       fun bar(t: A[T]) do end
+       fun bar2: A[T] do return self

 
        init do end
 end
 
        init do end
 end

@@ -31,7 +31,7 @@ class B
 #alt3#special A[Int]
        type U: Int
 
 #alt3#special A[Int]
        type U: Int
 

-       meth test
+       fun test

        do
                #alt1#var a = new A[Int]
                #alt2#var a = new A[U]
        do
                #alt1#var a = new A[Int]
                #alt2#var a = new A[U]

diff --git a/tests/bench_421.nit b/tests/bench_421.nit
index 91cf80e..b87347c 100644 (file)
--- a/tests/bench_421.nit
+++ b/tests/bench_421.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth count_421(n: Int): Int
+fun count_421(n: Int): Int

 # Return the number of steps to come back to 1
 do
        var steps = 0
 # Return the number of steps to come back to 1
 do
        var steps = 0

diff --git a/tests/bench_complex_sort.nit b/tests/bench_complex_sort.nit
index b86f796..1dac6e4 100644 (file)
--- a/tests/bench_complex_sort.nit
+++ b/tests/bench_complex_sort.nit
@@ -16,23 +16,23 @@
 
 
 interface Elt
 
 
 interface Elt

-       meth val1: Int is abstract
-       meth val2: Int do return val1
+       fun val1: Int is abstract
+       fun val2: Int do return val1

 end
 
 class A
 special Elt
 end
 
 class A
 special Elt

-       attr _a: Int
-       redef meth val1: Int do return _a
+       var _a: Int
+       redef fun val1: Int do return _a

 
        init(i: Int) do _a = i
 end
 
 class Elt2
 special Elt
 
        init(i: Int) do _a = i
 end
 
 class Elt2
 special Elt

-       attr _b: Int
-       redef meth val1: Int do return _b/2
-       redef meth val2: Int do return _b
+       var _b: Int
+       redef fun val1: Int do return _b/2
+       redef fun val2: Int do return _b

        init initelt2(i: Int) do _b = i
 end
 
        init initelt2(i: Int) do _b = i
 end
 

@@ -43,10 +43,10 @@ end
 
 class C
 special Elt
 
 class C
 special Elt

-       attr _c: Int
-       attr _d: Int
-       redef meth val1: Int do return _c end
-       redef meth val2: Int do return _d end
+       var _c: Int
+       var _d: Int
+       redef fun val1: Int do return _c end
+       redef fun val2: Int do return _d end

 
        init init2(i: Int, j: Int) do
                _c = i
 
        init init2(i: Int, j: Int) do
                _c = i

@@ -57,8 +57,8 @@ end
 class D
 special A
 special Elt2
 class D
 special A
 special Elt2

-       redef meth val1: Int do return _a end
-       redef meth val2: Int do return _b end
+       redef fun val1: Int do return _a end
+       redef fun val2: Int do return _b end

 
        init init2(i: Int, j: Int) do
                init(i)
 
        init init2(i: Int, j: Int) do
                init(i)

@@ -68,14 +68,14 @@ end
 
 class E
 special Elt2
 
 class E
 special Elt2

-       redef meth val1: Int do return 5 end
+       redef fun val1: Int do return 5 end

 
        init(i: Int) do initelt2(i)
 end
 
 class EltSorter
 special AbstractSorter[Elt]
 
        init(i: Int) do initelt2(i)
 end
 
 class EltSorter
 special AbstractSorter[Elt]

-       redef meth compare(a: Elt, b: Elt): Int
+       redef fun compare(a: Elt, b: Elt): Int

        do
                if _is_val1 then
                        return a.val1 <=> b.val1
        do
                if _is_val1 then
                        return a.val1 <=> b.val1

@@ -84,17 +84,17 @@ special AbstractSorter[Elt]
                end
        end
        
                end
        end
        

-       meth toggle
+       fun toggle

        do
                _is_val1 = not _is_val1
        end
        
        do
                _is_val1 = not _is_val1
        end
        

-       attr _is_val1: Bool = false
+       var _is_val1: Bool = false

 
        init do end
 end
 
 
        init do end
 end
 

-meth generator: Elt
+fun generator: Elt

 do
        var r = 5.rand
        if r == 0 then
 do
        var r = 5.rand
        if r == 0 then

diff --git a/tests/bench_fib.nit b/tests/bench_fib.nit
index a67cdc5..69dc371 100644 (file)
--- a/tests/bench_fib.nit
+++ b/tests/bench_fib.nit
@@ -17,7 +17,7 @@
 # The fibbonacci program
 
 redef class Int
 # The fibbonacci program
 
 redef class Int

-       meth fib: Int
+       fun fib: Int

        # Unefficient recursive implementation
        do
                if self <= 0 then
        # Unefficient recursive implementation
        do
                if self <= 0 then

diff --git a/tests/bench_int_range_closure.nit b/tests/bench_int_range_closure.nit
index 16e6e7b..29ad676 100644 (file)
--- a/tests/bench_int_range_closure.nit
+++ b/tests/bench_int_range_closure.nit
@@ -16,7 +16,7 @@
 
 
 redef class Range[K]
 
 
 redef class Range[K]

-       meth for_each(x: Int)
+       fun for_each(x: Int)

                with each(i: K)
        do
                var c = first
                with each(i: K)
        do
                var c = first

diff --git a/tests/bench_netsim.nit b/tests/bench_netsim.nit
index ffc0f3c..6a9ade7 100644 (file)
--- a/tests/bench_netsim.nit
+++ b/tests/bench_netsim.nit
@@ -15,29 +15,29 @@
 # limitations under the License.
 
 class Node
 # limitations under the License.
 
 class Node

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return _name
        end
        do
                return _name
        end

-       attr _name: String = "noname"
+       var _name: String = "noname"

 end
 
 class WakeUpNode
 special Node
 end
 
 class WakeUpNode
 special Node

-       meth wake_up is abstract
+       fun wake_up is abstract

        # Wake up the node
        # Wake up the node

-       meth wake_up_in(d: Int)
+       fun wake_up_in(d: Int)

        # Ask to be weaked up in `d' time units
        do
                _scheduler.add_event(self, d)
        end
        # Ask to be weaked up in `d' time units
        do
                _scheduler.add_event(self, d)
        end

-       attr _scheduler: Scheduler
+       var _scheduler: Scheduler

 end
 
 class NodeSource
 special Node
 end
 
 class NodeSource
 special Node

-       attr _nexts: nullable ArraySet[NodeSink] = null
-       meth attach(n: NodeSink)
+       var _nexts: nullable ArraySet[NodeSink] = null
+       fun attach(n: NodeSink)

        # Add the sink `n' the the connected nodes
        # Do nothing if `n' is already connected
        do
        # Add the sink `n' the the connected nodes
        # Do nothing if `n' is already connected
        do

@@ -49,7 +49,7 @@ special Node
                _nexts.add(n)
        end
        
                _nexts.add(n)
        end
        

-       meth detach(n: NodeSink)
+       fun detach(n: NodeSink)

        # Remove the sink `n' from the connected nodes
        # Do nothing if `n' is not connected
        do
        # Remove the sink `n' from the connected nodes
        # Do nothing if `n' is not connected
        do

@@ -57,7 +57,7 @@ special Node
                _nexts.remove(n)
        end
 
                _nexts.remove(n)
        end
 

-       protected meth send
+       protected fun send

        # Notify the sinks by calling the recieve(1) method of each sink
        do
                if _nexts == null then
        # Notify the sinks by calling the recieve(1) method of each sink
        do
                if _nexts == null then

@@ -71,23 +71,23 @@ end
 
 class NodeSink
 special Node
 
 class NodeSink
 special Node

-       meth recieve(n: NodeSource) is abstract
+       fun recieve(n: NodeSource) is abstract

        # the `n' has emeted a signal
 end
 
 #
 
 class Scheduler
        # the `n' has emeted a signal
 end
 
 #
 
 class Scheduler

-       attr _time_list: Array[Couple[Int, WakeUpNode]] = new Array[Couple[Int, WakeUpNode]]
-       attr _time: Int = 0 # What time is it ?
-       meth add_event(n: WakeUpNode, d: Int)
+       var _time_list: Array[Couple[Int, WakeUpNode]] = new Array[Couple[Int, WakeUpNode]]
+       var _time: Int = 0 # What time is it ?
+       fun add_event(n: WakeUpNode, d: Int)

        # The node `n' whant to be weaked up in `d' time units
        do
                var entry = new Couple[Int, WakeUpNode](d+_time, n)
                _time_list.add(entry)
        end
 
        # The node `n' whant to be weaked up in `d' time units
        do
                var entry = new Couple[Int, WakeUpNode](d+_time, n)
                _time_list.add(entry)
        end
 

-       meth next_event: nullable WakeUpNode
+       fun next_event: nullable WakeUpNode

        # Get the
        do
                if _time_list.is_empty then
        # Get the
        do
                if _time_list.is_empty then

@@ -107,7 +107,7 @@ class Scheduler
                return entry.second
        end
 
                return entry.second
        end
 

-       meth run_for(time_limit: Int)
+       fun run_for(time_limit: Int)

        do
                while true do
                        var node = next_event 
        do
                while true do
                        var node = next_event 

@@ -133,13 +133,13 @@ end
 class BeepSource
 special NodeSource
 special WakeUpNode
 class BeepSource
 special NodeSource
 special WakeUpNode

-       redef meth wake_up
+       redef fun wake_up

        do
                send
                wake_up_in(_delay)
        end
        do
                send
                wake_up_in(_delay)
        end

-       attr _delay: Int
-       meth start
+       var _delay: Int
+       fun start

        do
                wake_up_in(_delay)
        end
        do
                wake_up_in(_delay)
        end

@@ -154,8 +154,8 @@ end
 
 class CountSink
 special NodeSink
 
 class CountSink
 special NodeSink

-       readable attr _count: Int = 0
-       redef meth recieve(n: NodeSource)
+       readable var _count: Int = 0
+       redef fun recieve(n: NodeSource)

        do
                _count = _count + 1
        end
        do
                _count = _count + 1
        end

@@ -173,8 +173,8 @@ end
 class NodeAlternate
 special NodeSink
 special NodeSource
 class NodeAlternate
 special NodeSink
 special NodeSource

-       attr _last: nullable NodeSource
-       redef meth recieve(n: NodeSource)
+       var _last: nullable NodeSource
+       redef fun recieve(n: NodeSource)

        do
                if n != _last then
                        _last = n
        do
                if n != _last then
                        _last = n

@@ -191,8 +191,8 @@ end
 class NodeEat
 special CountSink
 special NodeSource
 class NodeEat
 special CountSink
 special NodeSource

-       attr _limit: Int
-       redef meth recieve(n: NodeSource)
+       var _limit: Int
+       redef fun recieve(n: NodeSource)

        do
                var c = _count + 1
                if c >= _limit then
        do
                var c = _count + 1
                if c >= _limit then

@@ -214,12 +214,12 @@ class NodeDelay
 special NodeSource
 special NodeSink
 special WakeUpNode
 special NodeSource
 special NodeSink
 special WakeUpNode

-       attr _delay: Int
-       redef meth recieve(n: NodeSource)
+       var _delay: Int
+       redef fun recieve(n: NodeSource)

        do
                wake_up_in(_delay)
        end
        do
                wake_up_in(_delay)
        end

-       redef meth wake_up
+       redef fun wake_up

        do
                send
        end
        do
                send
        end

diff --git a/tests/bench_nsieve_bool.nit b/tests/bench_nsieve_bool.nit
index 4adb225..36da71a 100644 (file)
--- a/tests/bench_nsieve_bool.nit
+++ b/tests/bench_nsieve_bool.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth nsieve(n: Int): Int
+fun nsieve(n: Int): Int

 do
        var count = n-2
        var array = new Array[Bool].with_capacity(n)
 do
        var count = n-2
        var array = new Array[Bool].with_capacity(n)

@@ -36,7 +36,7 @@ do
        return count
 end
 
        return count
 end
 

-meth test(n: Int)
+fun test(n: Int)

 do
        var m = 10000.lshift(n)
        print("Primes up to {m} {nsieve(m)}")
 do
        var m = 10000.lshift(n)
        print("Primes up to {m} {nsieve(m)}")

diff --git a/tests/bench_prime.nit b/tests/bench_prime.nit
index 32bd5b5..f34f432 100644 (file)
--- a/tests/bench_prime.nit
+++ b/tests/bench_prime.nit
@@ -16,7 +16,7 @@
 
 
 redef class Int
 
 
 redef class Int

-       meth is_premier: Bool
+       fun is_premier: Bool

        do
                var i = 2
                while i < self do
        do
                var i = 2
                while i < self do

diff --git a/tests/bench_random_n_sort.nit b/tests/bench_random_n_sort.nit
index 5287a54..d1689f6 100644 (file)
--- a/tests/bench_random_n_sort.nit
+++ b/tests/bench_random_n_sort.nit
@@ -17,7 +17,7 @@
 import example_sorts
 
 redef class Int
 import example_sorts
 
 redef class Int

-       meth random: Int
+       fun random: Int

        # Return a random generated number between 0 and self
        do
                var val = (last_number.value * 3877 + 29573) % 139968
        # Return a random generated number between 0 and self
        do
                var val = (last_number.value * 3877 + 29573) % 139968

@@ -25,14 +25,14 @@ redef class Int
                return val % self
        end
 
                return val % self
        end
 

-       meth last_number: Integer
+       fun last_number: Integer

        do
                return once new Integer
        end
 end
 
 class Integer
        do
                return once new Integer
        end
 end
 
 class Integer

-       readable writable attr _value: Int 
+       readable writable var _value: Int 

 
        init
        do
 
        init
        do

diff --git a/tests/bench_send.nit b/tests/bench_send.nit
index ee546c9..2a7fa1b 100644 (file)
--- a/tests/bench_send.nit
+++ b/tests/bench_send.nit
@@ -16,8 +16,8 @@
 
 
 class A
 
 
 class A

-       readable writable attr _val: Int = 0
-       meth hop(a: A, b: A, c: A)
+       readable writable var _val: Int = 0
+       fun hop(a: A, b: A, c: A)

        do
                if a.val > val then
                        a.hop(b, c, self)
        do
                if a.val > val then
                        a.hop(b, c, self)

@@ -27,7 +27,7 @@ class A
                foo(b, c)
                foo(c, b)
        end
                foo(b, c)
                foo(c, b)
        end

-       meth foo(a: A, b: A)
+       fun foo(a: A, b: A)

        do
                if a.val > val then
                        a.foo(b, self)
        do
                if a.val > val then
                        a.foo(b, self)

@@ -35,14 +35,14 @@ class A
                bar(a)
                bar(b)
        end
                bar(a)
                bar(b)
        end

-       meth bar(a: A)
+       fun bar(a: A)

        do
                if a.val > val then
                        a.bar(self)
                end
                baz
        end
        do
                if a.val > val then
                        a.bar(self)
                end
                baz
        end

-       meth baz
+       fun baz

        do
        end
 
        do
        end
 

@@ -53,7 +53,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth val: Int
+       redef fun val: Int

        do
                return 1
        end
        do
                return 1
        end

@@ -65,7 +65,7 @@ end
 
 class C
 special A
 
 class C
 special A

-       redef meth val: Int
+       redef fun val: Int

        do
                return 2
        end
        do
                return 2
        end

@@ -77,7 +77,7 @@ end
 
 class D
 special A
 
 class D
 special A

-       redef meth val: Int
+       redef fun val: Int

        do
                return 3
        end
        do
                return 3
        end

diff --git a/tests/bench_send2.nit b/tests/bench_send2.nit
index c1e29c6..cf863b8 100644 (file)
--- a/tests/bench_send2.nit
+++ b/tests/bench_send2.nit
@@ -15,15 +15,15 @@
 # limitations under the License.
 
 redef class Object
 # limitations under the License.
 
 redef class Object

-       meth foo do end
+       fun foo do end

 end
 class A
 end
 class A

-       redef meth foo do end
+       redef fun foo do end

        init do end
 end
 class B
 special A
        init do end
 end
 class B
 special A

-       redef meth foo do end
+       redef fun foo do end

        init do end
 
 end
        init do end
 
 end

@@ -41,14 +41,14 @@ end
 class E
 special B
 special C
 class E
 special B
 special C

-       redef meth foo do end
+       redef fun foo do end

        init do end
 
 end
 class F
 special D
 special E
        init do end
 
 end
 class F
 special D
 special E

-       redef meth foo do end
+       redef fun foo do end

        init do end
 
 end
        init do end
 
 end

diff --git a/tests/bench_tak.nit b/tests/bench_tak.nit
index 5266e93..3ffaaf1 100644 (file)
--- a/tests/bench_tak.nit
+++ b/tests/bench_tak.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
 # limitations under the License.
 
 

-meth tak(x: Int, y: Int, z: Int): Int
+fun tak(x: Int, y: Int, z: Int): Int

 do
        if not y < x then
                return z
 do
        if not y < x then
                return z

diff --git a/tests/error_attr_2def.nit b/tests/error_attr_2def.nit
index 75efb44..497cd8e 100644 (file)
--- a/tests/error_attr_2def.nit
+++ b/tests/error_attr_2def.nit
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       attr _toto: Int
-       attr _toto: Object
+       var _toto: Int
+       var _toto: Object

 end
 end

diff --git a/tests/error_attr_assign.nit b/tests/error_attr_assign.nit
index 64afb68..ba807d1 100644 (file)
--- a/tests/error_attr_assign.nit
+++ b/tests/error_attr_assign.nit
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       attr _toto: Int
-       meth m
+       var _toto: Int
+       fun m

        do
                _toto = 't'
        end
        do
                _toto = 't'
        end

diff --git a/tests/error_defs.nit b/tests/error_defs.nit
index b210098..3a66003 100644 (file)
--- a/tests/error_defs.nit
+++ b/tests/error_defs.nit
@@ -18,32 +18,32 @@ import kernel
 
 #alt1#class Object
 redef class Object #!alt1#
 
 #alt1#class Object
 redef class Object #!alt1#

-       meth bar: Int do return 10 + baz
+       fun bar: Int do return 10 + baz

 end
 
 class A
 end
 
 class A

-       meth foo: Int do return 100 + bar
-#alt2# meth foo(c: Char) do (200 + bar).output
-       redef meth bar: Int do return 20 + baz #!alt3#
-#alt3# meth bar: Int do return 30 + baz
-#alt4# meth baz(c: Char) do 2.output
-#alt5# redef meth baz(c: Char) do 2.output
+       fun foo: Int do return 100 + bar
+#alt2# fun foo(c: Char) do (200 + bar).output
+       redef fun bar: Int do return 20 + baz #!alt3#
+#alt3# fun bar: Int do return 30 + baz
+#alt4# fun baz(c: Char) do 2.output
+#alt5# redef fun baz(c: Char) do 2.output

 
        init do end
 end
 
 #alt6#class A
 
        init do end
 end
 
 #alt6#class A

-#alt6# meth foo: Int do return 300 + bar
+#alt6# fun foo: Int do return 300 + bar

 #alt6#end
 #alt7#redef class A
 #alt6#end
 #alt7#redef class A

-#alt7# meth foo: Int do return 300 + bar
+#alt7# fun foo: Int do return 300 + bar

 #alt7#end
 #alt8#redef class A
 #alt7#end
 #alt8#redef class A

-#alt8# redef meth foo: Int do return 300 + bar
+#alt8# redef fun foo: Int do return 300 + bar

 #alt8#end
 
 
 #alt8#end
 
 

-meth baz: Int do return 1
+fun baz: Int do return 1

 
 baz.output
 bar.output
 
 baz.output
 bar.output

diff --git a/tests/error_formal.nit b/tests/error_formal.nit
index ca262f2..b8555d3 100644 (file)
--- a/tests/error_formal.nit
+++ b/tests/error_formal.nit
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 class A[T]
 # limitations under the License.
 
 class A[T]

-       attr _k: T[Int]
+       var _k: T[Int]

 end
 end

diff --git a/tests/error_fun_ret.nit b/tests/error_fun_ret.nit
index 959efb9..8744a8e 100644 (file)
--- a/tests/error_fun_ret.nit
+++ b/tests/error_fun_ret.nit
@@ -14,6 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
 end
 do
 end

diff --git a/tests/error_fun_ret2.nit b/tests/error_fun_ret2.nit
index 02e6c43..7f09bfc 100644 (file)
--- a/tests/error_fun_ret2.nit
+++ b/tests/error_fun_ret2.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        if true then
                return 0
 do
        if true then
                return 0

diff --git a/tests/error_fun_ret3.nit b/tests/error_fun_ret3.nit
index 4db8276..0825cb5 100644 (file)
--- a/tests/error_fun_ret3.nit
+++ b/tests/error_fun_ret3.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        if false then
        else
 do
        if false then
        else

diff --git a/tests/error_fun_ret4.nit b/tests/error_fun_ret4.nit
index d562c57..9d74ff0 100644 (file)
--- a/tests/error_fun_ret4.nit
+++ b/tests/error_fun_ret4.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        while true
        do
 do
        while true
        do

diff --git a/tests/error_fun_ret5.nit b/tests/error_fun_ret5.nit
index d5d1ec0..b4173ec 100644 (file)
--- a/tests/error_fun_ret5.nit
+++ b/tests/error_fun_ret5.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        for i in new Array[Int] do
                return 1
 do
        for i in new Array[Int] do
                return 1

diff --git a/tests/error_init_auto.nit b/tests/error_init_auto.nit
index 2a913c5..b7e6aa4 100644 (file)
--- a/tests/error_init_auto.nit
+++ b/tests/error_init_auto.nit
@@ -17,13 +17,13 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       readable attr _x: Int #!alt1#
-       #alt1#readable attr _x: Int = 2
-       readable attr _y: Int = -2 #!alt2#
-       #alt2#readable attr _y: Int
+       readable var _x: Int #!alt1#
+       #alt1#readable var _x: Int = 2
+       readable var _y: Int = -2 #!alt2#
+       #alt2#readable var _y: Int

        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx
        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx

-       meth work
+       fun work

        do
                _x.output
                _y.output
        do
                _x.output
                _y.output

diff --git a/tests/error_kern_attr_any.nit b/tests/error_kern_attr_any.nit
index 54e3b7b..8146788 100644 (file)
--- a/tests/error_kern_attr_any.nit
+++ b/tests/error_kern_attr_any.nit
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 redef class Object
 # limitations under the License.
 
 redef class Object

-       attr _toto: Bool
+       var _toto: Bool

 end
 end

diff --git a/tests/error_kern_attr_int.nit b/tests/error_kern_attr_int.nit
index 18ef45e..5140f70 100644 (file)
--- a/tests/error_kern_attr_int.nit
+++ b/tests/error_kern_attr_int.nit
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 redef class Int
 # limitations under the License.
 
 redef class Int

-       attr _toto: Object
+       var _toto: Object

 end
 end

diff --git a/tests/error_meth_2def.nit b/tests/error_meth_2def.nit
index ebd5eeb..140089c 100644 (file)
--- a/tests/error_meth_2def.nit
+++ b/tests/error_meth_2def.nit
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth toto(a: Int) do end
-       meth toto(a: Char) do end
+       fun toto(a: Int) do end
+       fun toto(a: Char) do end

 end
 end

diff --git a/tests/error_meth_2def2.nit b/tests/error_meth_2def2.nit
index 5765371..8e10ea6 100644 (file)
--- a/tests/error_meth_2def2.nit
+++ b/tests/error_meth_2def2.nit
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth toto(a: Int) do end
-       meth toto(a: Int): Int do return 0 end
+       fun toto(a: Int) do end
+       fun toto(a: Int): Int do return 0 end

 end
 end

diff --git a/tests/error_meth_create.nit b/tests/error_meth_create.nit
index 1b65e0b..d8b4f93 100644 (file)
--- a/tests/error_meth_create.nit
+++ b/tests/error_meth_create.nit
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth foo do end
+       fun foo do end

 end
 var b = new A.foo
 end
 var b = new A.foo

diff --git a/tests/error_prop_glob.nit b/tests/error_prop_glob.nit
index 2065003..8010187 100644 (file)
--- a/tests/error_prop_glob.nit
+++ b/tests/error_prop_glob.nit
@@ -20,10 +20,10 @@ class Object
 end
 
 class A
 end
 
 class A

-       meth toto do end
+       fun toto do end

 end
 class B
 end
 class B

-       meth toto do end
+       fun toto do end

 end
 class C
 special A
 end
 class C
 special A

diff --git a/tests/error_prop_loc.nit b/tests/error_prop_loc.nit
index e0407ad..3aceac3 100644 (file)
--- a/tests/error_prop_loc.nit
+++ b/tests/error_prop_loc.nit
@@ -19,15 +19,15 @@ class Object
 end
 
 class A
 end
 
 class A

-       meth toto do end
+       fun toto do end

 end
 class B
 special A
 end
 class B
 special A

-       redef meth toto do end
+       redef fun toto do end

 end
 class C
 special A
 end
 class C
 special A

-       redef meth toto do end
+       redef fun toto do end

 end
 class D
 special B
 end
 class D
 special B

diff --git a/tests/error_ref_attr.nit b/tests/error_ref_attr.nit
index 5d5b0ff..dbee0ba 100644 (file)
--- a/tests/error_ref_attr.nit
+++ b/tests/error_ref_attr.nit
@@ -17,5 +17,5 @@
 import module_simple
 
 redef class C
 import module_simple
 
 redef class C

-       redef attr _a: Int
+       redef var _a: Int

 end
 end

diff --git a/tests/error_ref_fun.nit b/tests/error_ref_fun.nit
index 21481dc..8267289 100644 (file)
--- a/tests/error_ref_fun.nit
+++ b/tests/error_ref_fun.nit
@@ -17,5 +17,5 @@
 import module_simple
 
 redef class C
 import module_simple
 
 redef class C

-       redef meth s do end
+       redef fun s do end

 end
 end

diff --git a/tests/error_ref_param.nit b/tests/error_ref_param.nit
index b38b67b..4a9f644 100644 (file)
--- a/tests/error_ref_param.nit
+++ b/tests/error_ref_param.nit
@@ -17,5 +17,5 @@
 import module_simple
 
 redef class C
 import module_simple
 
 redef class C

-       redef meth r(x: C) do end
+       redef fun r(x: C) do end

 end
 end

diff --git a/tests/error_ref_proc.nit b/tests/error_ref_proc.nit
index 3b8ec9d..18f5452 100644 (file)
--- a/tests/error_ref_proc.nit
+++ b/tests/error_ref_proc.nit
@@ -17,5 +17,5 @@
 import module_simple
 
 redef class C
 import module_simple
 
 redef class C

-       redef meth r(x: B): B do return self end
+       redef fun r(x: B): B do return self end

 end
 end

diff --git a/tests/error_ref_ret.nit b/tests/error_ref_ret.nit
index 40123e8..1aedf5a 100644 (file)
--- a/tests/error_ref_ret.nit
+++ b/tests/error_ref_ret.nit
@@ -17,5 +17,5 @@
 import module_simple
 
 redef class C
 import module_simple
 
 redef class C

-       redef meth s: Int do return 1 end
+       redef fun s: Int do return 1 end

 end
 end

diff --git a/tests/error_ret_fun.nit b/tests/error_ret_fun.nit
index c5cf4fa..3505137 100644 (file)
--- a/tests/error_ret_fun.nit
+++ b/tests/error_ret_fun.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        return
 end
 do
        return
 end

diff --git a/tests/error_ret_proc.nit b/tests/error_ret_proc.nit
index ecc429e..ddcb081 100644 (file)
--- a/tests/error_ret_proc.nit
+++ b/tests/error_ret_proc.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto
+fun toto

 do
        return 5
 end
 do
        return 5
 end

diff --git a/tests/error_ret_type.nit b/tests/error_ret_type.nit
index 562b740..41dc4b4 100644 (file)
--- a/tests/error_ret_type.nit
+++ b/tests/error_ret_type.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto: Int
+fun toto: Int

 do
        return '4'
 end
 do
        return '4'
 end

diff --git a/tests/error_spe_attr.nit b/tests/error_spe_attr.nit
index 7c4610c..235eef4 100644 (file)
--- a/tests/error_spe_attr.nit
+++ b/tests/error_spe_attr.nit
@@ -15,9 +15,9 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       attr _a: Int
+       var _a: Int

 end
 class B
 special A
 end
 class B
 special A

-       redef attr _a: Object
+       redef var _a: Object

 end
 end

diff --git a/tests/error_spe_fun.nit b/tests/error_spe_fun.nit
index 79ab213..c98cc5a 100644 (file)
--- a/tests/error_spe_fun.nit
+++ b/tests/error_spe_fun.nit
@@ -15,10 +15,10 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-meth toto: Int do return 1 end
+fun toto: Int do return 1 end

 end
 
 class B
 special A
 end
 
 class B
 special A

-redef meth toto do end
+redef fun toto do end

 end
 end

diff --git a/tests/error_spe_param.nit b/tests/error_spe_param.nit
index 8bcd2f3..590802a 100644 (file)
--- a/tests/error_spe_param.nit
+++ b/tests/error_spe_param.nit
@@ -16,10 +16,10 @@
 
 import kernel
 class A
 
 import kernel
 class A

-meth toto(i: Int) do end
+fun toto(i: Int) do end

 end
 
 class B
 special A
 end
 
 class B
 special A

-redef meth toto(c: Object) do end
+redef fun toto(c: Object) do end

 end
 end

diff --git a/tests/error_spe_param2.nit b/tests/error_spe_param2.nit
index 8f55b3d..e607091 100644 (file)
--- a/tests/error_spe_param2.nit
+++ b/tests/error_spe_param2.nit
@@ -16,10 +16,10 @@
 
 import kernel
 class A
 
 import kernel
 class A

-meth toto(i: Int) do end
+fun toto(i: Int) do end

 end
 
 class B
 special A
 end
 
 class B
 special A

-redef meth toto(c: Char) do end
+redef fun toto(c: Char) do end

 end
 end

diff --git a/tests/error_spe_proc.nit b/tests/error_spe_proc.nit
index d946e44..5a474df 100644 (file)
--- a/tests/error_spe_proc.nit
+++ b/tests/error_spe_proc.nit
@@ -15,10 +15,10 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-meth toto do end
+fun toto do end

 end
 
 class B
 special A
 end
 
 class B
 special A

-redef meth toto: Int do return 2end
+redef fun toto: Int do return 2end

 end
 end

diff --git a/tests/error_spe_ret.nit b/tests/error_spe_ret.nit
index 46375ff..313c2ce 100644 (file)
--- a/tests/error_spe_ret.nit
+++ b/tests/error_spe_ret.nit
@@ -15,10 +15,10 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-meth toto: Int do return 1 end
+fun toto: Int do return 1 end

 end
 
 class B
 special A
 end
 
 class B
 special A

-redef meth toto: Char do return 'a' end
+redef fun toto: Char do return 'a' end

 end
 end

diff --git a/tests/error_star_type.nit b/tests/error_star_type.nit
index 44eae7a..d93a114 100644 (file)
--- a/tests/error_star_type.nit
+++ b/tests/error_star_type.nit
@@ -14,5 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth toto(a: Int...) do end
+fun toto(a: Int...) do end

 toto(4,'5')
 toto(4,'5')

diff --git a/tests/error_super_many.nit b/tests/error_super_many.nit
index 8308cf9..f0ca826 100644 (file)
--- a/tests/error_super_many.nit
+++ b/tests/error_super_many.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

        do
                0.output
        end
        do
                0.output
        end

@@ -25,7 +25,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth foo
+       redef fun foo

        do
                1.output
        end
        do
                1.output
        end

@@ -33,7 +33,7 @@ end
 
 class C
 special A
 
 class C
 special A

-       redef meth foo
+       redef fun foo

        do
                2.output
        end
        do
                2.output
        end

@@ -42,7 +42,7 @@ end
 class D
 special B
 special C
 class D
 special B
 special C

-       redef meth foo
+       redef fun foo

        do
                super
        end
        do
                super
        end

diff --git a/tests/error_super_none.nit b/tests/error_super_none.nit
index bcadc86..aeddbd9 100644 (file)
--- a/tests/error_super_none.nit
+++ b/tests/error_super_none.nit
@@ -16,7 +16,7 @@
 
 import kernel
 class A
 
 import kernel
 class A

-       meth foo
+       fun foo

        do
                super
        end
        do
                super
        end

diff --git a/tests/example_beer.nit b/tests/example_beer.nit
index 17eefbb..9380c88 100644 (file)
--- a/tests/example_beer.nit
+++ b/tests/example_beer.nit
@@ -18,9 +18,9 @@
 # Just for fun
 
 class Bottle
 # Just for fun
 
 class Bottle

-       meth sing is abstract
+       fun sing is abstract

 private
 private

-       meth sing_start
+       fun sing_start

        do
                printn(self, " of beer on the wall.\n")
                printn(self, " of beer.\n")
        do
                printn(self, " of beer on the wall.\n")
                printn(self, " of beer.\n")

@@ -30,13 +30,13 @@ end
 
 class OneBottle
 special Bottle
 
 class OneBottle
 special Bottle

-       redef meth sing
+       redef fun sing

        do
                sing_start
                printn("No more bottles of appear on the wall!\n\n")
        end
 
        do
                sing_start
                printn("No more bottles of appear on the wall!\n\n")
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return "One bottle"
        end
        do
                return "One bottle"
        end

@@ -46,13 +46,13 @@ end
 
 class TwoBottles
 special Bottle
 
 class TwoBottles
 special Bottle

-       redef meth sing
+       redef fun sing

        do
                sing_start
                printn("One bottle appears on the wall\n\n")
        end
 
        do
                sing_start
                printn("One bottle appears on the wall\n\n")
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return "2 bottles"
        end
        do
                return "2 bottles"
        end

@@ -63,13 +63,13 @@ end
 class Bottles
 special Bottle
 
 class Bottles
 special Bottle
 

-       redef meth sing
+       redef fun sing

        do
                sing_start
                printn(_quantity - 1," bottles appear on the wall!\n\n")
        end
 
        do
                sing_start
                printn(_quantity - 1," bottles appear on the wall!\n\n")
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return _quantity.to_s + " bottles"
        end
        do
                return _quantity.to_s + " bottles"
        end

@@ -79,7 +79,7 @@ special Bottle
                _quantity = i
        end
 
                _quantity = i
        end
 

-       attr _quantity: Int
+       var _quantity: Int

 end
 
 var i = 99
 end
 
 var i = 99

diff --git a/tests/example_hanoi.nit b/tests/example_hanoi.nit
index d99994e..ee46d40 100644 (file)
--- a/tests/example_hanoi.nit
+++ b/tests/example_hanoi.nit
@@ -18,32 +18,32 @@
 
 class Tower
        # A tower is a stack of discus.
 
 class Tower
        # A tower is a stack of discus.

-       meth top: Int
+       fun top: Int

        # Diameter of the last discus.
        do
                return _t.last
        end
 
        # Diameter of the last discus.
        do
                return _t.last
        end
 

-       meth height: Int
+       fun height: Int

        # Number of discus.
        do
                return _t.length
        end
 
        # Number of discus.
        do
                return _t.length
        end
 

-       meth push(i: Int)
+       fun push(i: Int)

        # Put an discus of diameter `i'.
        do
                _t.push(i)
        end
 
        # Put an discus of diameter `i'.
        do
                _t.push(i)
        end
 

-       meth pop: Int
+       fun pop: Int

        # Remove the last discus and get its diameter.
        do
                assert not_empty: not _t.is_empty
                return _t.pop
        end
 
        # Remove the last discus and get its diameter.
        do
                assert not_empty: not _t.is_empty
                return _t.pop
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        # Display the tower
        do
                if _t.is_empty then
        # Display the tower
        do
                if _t.is_empty then

@@ -53,7 +53,7 @@ class Tower
                end
        end
 
                end
        end
 

-       attr _t: Array[Int] # The stack of discus (only the diameter is stored).
+       var _t: Array[Int] # The stack of discus (only the diameter is stored).

 
        init full(n: Int)
        # Build a new tower with `n' discus.
 
        init full(n: Int)
        # Build a new tower with `n' discus.

@@ -74,12 +74,12 @@ end
 
 class Hanoi
        # Hanoi is a city with 3 towers.
 
 class Hanoi
        # Hanoi is a city with 3 towers.

-       meth run
+       fun run

        do
                move(_tower1.height, _tower1, _tower2, _tower3)
        end
 
        do
                move(_tower1.height, _tower1, _tower2, _tower3)
        end
 

-       private meth move(nb: Int, source: Tower, intermediate: Tower, destination: Tower)
+       private fun move(nb: Int, source: Tower, intermediate: Tower, destination: Tower)

        do
                if nb <= 0 then
                        return
        do
                if nb <= 0 then
                        return

@@ -90,14 +90,14 @@ class Hanoi
                move(nb-1, intermediate, source, destination)
        end
 
                move(nb-1, intermediate, source, destination)
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return "{_tower1} {_tower2} {_tower3}"
        end
 
        do
                return "{_tower1} {_tower2} {_tower3}"
        end
 

-       attr _tower1: Tower
-       attr _tower2: Tower
-       attr _tower3: Tower
+       var _tower1: Tower
+       var _tower2: Tower
+       var _tower3: Tower

 
        init(nb: Int)
        do
 
        init(nb: Int)
        do

@@ -107,7 +107,7 @@ class Hanoi
        end
 end
 
        end
 end
 

-meth usage
+fun usage

 do
        print("Usage: hanoi <number of discus>")
        exit(0)
 do
        print("Usage: hanoi <number of discus>")
        exit(0)

diff --git a/tests/example_objet.nit b/tests/example_objet.nit
index cc67246..ac72c4e 100644 (file)
--- a/tests/example_objet.nit
+++ b/tests/example_objet.nit
@@ -61,9 +61,9 @@ private
 # Dans un bloc "private", les propriétés déclarées sont seulement accessibles au
 # receveur ("self")
 
 # Dans un bloc "private", les propriétés déclarées sont seulement accessibles au
 # receveur ("self")
 

-# Les attributs sont déclarés par le mot clé "meth" et commencent par un "@"
-       attr _nom_: String              # Un entrepôt a un nom (de type chaîne).
-       attr _rayons: Array[Rayon]      # Il est composé d'un ensemble de rayon.
+# Les attributs sont déclarés par le mot clé "fun" et commencent par un "@"
+       var _nom_: String               # Un entrepôt a un nom (de type chaîne).
+       var _rayons: Array[Rayon]       # Il est composé d'un ensemble de rayon.

        # "Array" est une classe paramétrée, les crochets en sont la marque.
        # La classe "Rayon" est définie plus loin
 
        # "Array" est une classe paramétrée, les crochets en sont la marque.
        # La classe "Rayon" est définie plus loin
 

@@ -71,9 +71,9 @@ private
 # Les propriétés déclarées dans un bloc "public" sont accessibles à tout le
 # monde.
 
 # Les propriétés déclarées dans un bloc "public" sont accessibles à tout le
 # monde.
 

-# Les méthodes (fonctions et procédures) sont déclarées par le mot clé "meth"
+# Les méthodes (fonctions et procédures) sont déclarées par le mot clé "fun"

        # nom est une fonction qui retourne une chaîne
        # nom est une fonction qui retourne une chaîne

-       meth nom: String
+       fun nom: String

        do
                # "return" sort de la fonction
                return _nom_
        do
                # "return" sort de la fonction
                return _nom_

@@ -83,21 +83,21 @@ private
        end
        
        # set_nom est une procédure qui prend une chaîne en paramètre
        end
        
        # set_nom est une procédure qui prend une chaîne en paramètre

-       meth set_nom(n: String)
+       fun set_nom(n: String)

        do
                _nom_ = n               # "=" désigne l'affectation
                # Les affectations sont des instructions et ne sont pas
                # chaînées
        end
 
        do
                _nom_ = n               # "=" désigne l'affectation
                # Les affectations sont des instructions et ne sont pas
                # chaînées
        end
 

-       meth add_rayon(r: Rayon)
+       fun add_rayon(r: Rayon)

        do
                _rayons.add(r)          # "add" ajoute un élément
        end
 
        # to_s est la méthode implicitement appelée par "print" et "println"
        # Il s'agit de la représentation "humaine" d'un objet
        do
                _rayons.add(r)          # "add" ajoute un élément
        end
 
        # to_s est la méthode implicitement appelée par "print" et "println"
        # Il s'agit de la représentation "humaine" d'un objet

-       redef meth to_s: String
+       redef fun to_s: String

        do
                # Les variables sont déclarées par "var", leur portée va de leur
                # déclaration jusqu'au "end" correspondant
        do
                # Les variables sont déclarées par "var", leur portée va de leur
                # déclaration jusqu'au "end" correspondant

@@ -156,19 +156,19 @@ end
 
 class Produit
 private
 
 class Produit
 private

-       attr _nom_: String              # Désignation du produit
-       attr _qte_: Int                         # Quantité en stock
+       var _nom_: String               # Désignation du produit
+       var _qte_: Int                  # Quantité en stock

 
 
 
        # Comme nous l'avons vu, les accesseurs en lecture sont
        # généralement homonymes aux attributs (au @ près).
 
 
 
        # Comme nous l'avons vu, les accesseurs en lecture sont
        # généralement homonymes aux attributs (au @ près).

-       meth nom: String
+       fun nom: String

        do
                return _nom_
        end
 
        do
                return _nom_
        end
 

-       meth qte: Int
+       fun qte: Int

        do
                return _qte_
        end
        do
                return _qte_
        end

@@ -176,7 +176,7 @@ private
        # Toutefois, pour les accesseurs en écriture, il est d'usage en NIT 
        # d'utiliser un type de méthode particulier appelé "accesseur universel"
        # son nom se caractérise par un "=" final
        # Toutefois, pour les accesseurs en écriture, il est d'usage en NIT 
        # d'utiliser un type de méthode particulier appelé "accesseur universel"
        # son nom se caractérise par un "=" final

-       meth qte=(i: Int)
+       fun qte=(i: Int)

        do
                _qte_ = i
        end
        do
                _qte_ = i
        end

@@ -190,7 +190,7 @@ private
        # la quantité d'un produit.
 
 
        # la quantité d'un produit.
 
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                # On peut aussi utiliser "+" pour concaténer les chaînes
                return _nom_ + ":" + _qte_.to_s
        do
                # On peut aussi utiliser "+" pour concaténer les chaînes
                return _nom_ + ":" + _qte_.to_s

@@ -208,11 +208,11 @@ end
 
 class Rayon
 private
 
 class Rayon
 private

-       attr _stock: Array[Produit]             # Des produits en stock
-       attr _rubrique: String                  # La catégorie des produits stockés
+       var _stock: Array[Produit]              # Des produits en stock
+       var _rubrique: String                   # La catégorie des produits stockés

 
        # Cette fonction est utilisé par to_s pour afficher un petit titre
 
        # Cette fonction est utilisé par to_s pour afficher un petit titre

-       meth to_s_head: String
+       fun to_s_head: String

        do
                # Les déclarations de type sont optionnelles dans un bloc "var".
                # Si une expression est passée comme valeur initiale d'une
        do
                # Les déclarations de type sont optionnelles dans un bloc "var".
                # Si une expression est passée comme valeur initiale d'une

@@ -227,7 +227,7 @@ private
                return s.to_s
        end
 
                return s.to_s
        end
 

-       meth cherche_produit(n: String): nullable Produit
+       fun cherche_produit(n: String): nullable Produit

        do
                var i = _stock.iterator
                while i.is_ok do
        do
                var i = _stock.iterator
                while i.is_ok do

@@ -243,7 +243,7 @@ private
        end
 
 
        end
 
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                var s = new Buffer
                s.append(to_s_head)
        do
                var s = new Buffer
                s.append(to_s_head)

@@ -269,7 +269,7 @@ private
 
        # Cette fonction permet de retourner la quantité d'un produit donné
        # Ce service est très simple à implémenter si on utilise cherche_produit
 
        # Cette fonction permet de retourner la quantité d'un produit donné
        # Ce service est très simple à implémenter si on utilise cherche_produit

-       meth quantite(n: String): Int
+       fun quantite(n: String): Int

        do
                var p = cherche_produit(n)
                # "==" est l'opérateur d'égalité d'identité
        do
                var p = cherche_produit(n)
                # "==" est l'opérateur d'égalité d'identité

@@ -283,7 +283,7 @@ private
        # Le service dual consiste à définir la quantité d'un produit
        # En NIT, il est d'usage de définir ce genre de service par un accesseur
        # universel :
        # Le service dual consiste à définir la quantité d'un produit
        # En NIT, il est d'usage de définir ce genre de service par un accesseur
        # universel :

-       meth quantite=(n: String, i: Int)
+       fun quantite=(n: String, i: Int)

        do
                var p = cherche_produit(n)
                if p == null then
        do
                var p = cherche_produit(n)
                if p == null then

@@ -321,15 +321,15 @@ special Rayon
 
 # Tant qu'on parle d'implicite, en l'absence de bloc de propriétés,
 # celles-ci sont déclarées en tant que "public"
 
 # Tant qu'on parle d'implicite, en l'absence de bloc de propriétés,
 # celles-ci sont déclarées en tant que "public"

-       meth temp_max: Int
+       fun temp_max: Int

        do
                return _temp_max_       # Attribut défini juste en dessous
        end
 
        do
                return _temp_max_       # Attribut défini juste en dessous
        end
 

-       attr _temp_max_: Int            # Une température maximale
+       var _temp_max_: Int             # Une température maximale

        # Les autres attributs sont bien sûr hérités !
 
        # Les autres attributs sont bien sûr hérités !
 

-       redef meth to_s_head: String            # On redéfinit cette méthode
+       redef fun to_s_head: String             # On redéfinit cette méthode

        do
        # nous avons vu le "append" et le "+" sur les chaînes, mais la
        # méthode la plus simple reste la construction "{}" qui
        do
        # nous avons vu le "append" et le "+" sur les chaînes, mais la
        # méthode la plus simple reste la construction "{}" qui

diff --git a/tests/example_point.nit b/tests/example_point.nit
index 3ab94cb..39738d7 100644 (file)
--- a/tests/example_point.nit
+++ b/tests/example_point.nit
@@ -16,42 +16,42 @@
 
 class Point
 private
 
 class Point
 private

-       attr _x: Int    # Abscisse
-       attr _y: Int    # Ordonnée
+       var _x: Int     # Abscisse
+       var _y: Int     # Ordonnée

 
 
 
 

-       meth x: Int
+       fun x: Int

        do
                return _x
        end
        do
                return _x
        end

-       meth x=(i: Int)
+       fun x=(i: Int)

        do
                _x = i
        end
 
        do
                _x = i
        end
 

-       meth y: Int
+       fun y: Int

        do
                return _y
        end
        do
                return _y
        end

-       meth y=(i: Int)
+       fun y=(i: Int)

        do
                _y = i
        end
 
        # Change la position d'un point
        do
                _y = i
        end
 
        # Change la position d'un point

-       meth moveto(x: Int, y: Int)
+       fun moveto(x: Int, y: Int)

        do
                _x = x
                _y = y
        end
 
        do
                _x = x
                _y = y
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                var s = "({_x}:{_y})"
                return s
        end
 
        do
                var s = "({_x}:{_y})"
                return s
        end
 

-       redef meth ==(p)
+       redef fun ==(p)

        do
                return not p is null and p isa Point and _x == p.x and _y == p.y
        end
        do
                return not p is null and p isa Point and _x == p.x and _y == p.y
        end

diff --git a/tests/example_procedural_string.nit b/tests/example_procedural_string.nit
index 35b7879..069ed21 100644 (file)
--- a/tests/example_procedural_string.nit
+++ b/tests/example_procedural_string.nit
@@ -16,7 +16,7 @@
 
 # A procedural program (without explicit class).
 
 
 # A procedural program (without explicit class).
 

-meth first_word(s: String): String
+fun first_word(s: String): String

 do
        var result = new Buffer
        var i = 0
 do
        var result = new Buffer
        var i = 0

diff --git a/tests/example_simple.nit b/tests/example_simple.nit
index 0feea6d..2627bd6 100644 (file)
--- a/tests/example_simple.nit
+++ b/tests/example_simple.nit
@@ -16,7 +16,7 @@
 
 # This program is a simple program without explicit class definition
 
 
 # This program is a simple program without explicit class definition
 

-meth say_goodnight(name: String): String
+fun say_goodnight(name: String): String

 do
        var gn = "Goodnight"
        return gn + ", " + name
 do
        var gn = "Goodnight"
        return gn + ", " + name

diff --git a/tests/example_sorter.nit b/tests/example_sorter.nit
index e82282c..7a5d8ab 100644 (file)
--- a/tests/example_sorter.nit
+++ b/tests/example_sorter.nit
@@ -17,7 +17,7 @@
 
 class BackIntSorter
 special AbstractSorter[Int]
 
 class BackIntSorter
 special AbstractSorter[Int]

-       redef meth compare(a: Int, b: Int): Int
+       redef fun compare(a: Int, b: Int): Int

        do
                return b <=> a
        end
        do
                return b <=> a
        end

@@ -27,7 +27,7 @@ end
 
 class DecimalSorter
 special AbstractSorter[Int]
 
 class DecimalSorter
 special AbstractSorter[Int]

-       redef meth compare(a: Int, b: Int): Int
+       redef fun compare(a: Int, b: Int): Int

        do
                return (a%10) <=> (b%10)
        end
        do
                return (a%10) <=> (b%10)
        end

@@ -35,7 +35,7 @@ special AbstractSorter[Int]
        init do end
 end
 
        init do end
 end
 

-meth get_an_array(nb: Int): Array[Int]
+fun get_an_array(nb: Int): Array[Int]

 do
        var res = new Array[Int].with_capacity(nb)
        var j = 64
 do
        var res = new Array[Int].with_capacity(nb)
        var j = 64

diff --git a/tests/example_sorts.nit b/tests/example_sorts.nit
index fcbf956..5a741f9 100644 (file)
--- a/tests/example_sorts.nit
+++ b/tests/example_sorts.nit
@@ -15,12 +15,12 @@
 # limitations under the License.
 
 
 # limitations under the License.
 
 

-meth quicksort(a: Array[Comparable])
+fun quicksort(a: Array[Comparable])

 do
        sub_quicksort(a, 0, a.length-1)
 end
 
 do
        sub_quicksort(a, 0, a.length-1)
 end
 

-meth sub_quicksort(a: Array[Comparable], g: Int, d: Int)
+fun sub_quicksort(a: Array[Comparable], g: Int, d: Int)

 do
        if g >= d then
                return
 do
        if g >= d then
                return

@@ -47,7 +47,7 @@ do
        sub_quicksort(a, i+1, d)
 end
 
        sub_quicksort(a, i+1, d)
 end
 

-meth heapsort(a: Array[Comparable])
+fun heapsort(a: Array[Comparable])

 do
        var i = a.length / 2 - 1 
        while i >= 0 do
 do
        var i = a.length / 2 - 1 
        while i >= 0 do

@@ -65,7 +65,7 @@ do
        end
 end
 
        end
 end
 

-meth sift_down(a: Array[Comparable], root: Int, bottom: Int)
+fun sift_down(a: Array[Comparable], root: Int, bottom: Int)

 do
        var done = false
        while not done do
 do
        var done = false
        while not done do

diff --git a/tests/example_time.nit b/tests/example_time.nit
index 9c47159..0455879 100644 (file)
--- a/tests/example_time.nit
+++ b/tests/example_time.nit
@@ -20,24 +20,24 @@
 # The Time class represents a quantity of time
 class Time
        # Internally, the quantity of time is stored in minutes
 # The Time class represents a quantity of time
 class Time
        # Internally, the quantity of time is stored in minutes

-       readable writable attr _min: Int = 0
+       readable writable var _min: Int = 0

 
        # The quantity ot time (in hours)
 
        # The quantity ot time (in hours)

-       meth hour: Int
+       fun hour: Int

        do
                # Need to transform minutes in hours
                return _min / 60
        end
 
        # Set the quantity of time (in hour)
        do
                # Need to transform minutes in hours
                return _min / 60
        end
 
        # Set the quantity of time (in hour)

-       meth hour=(i: Int)
+       fun hour=(i: Int)

        do
                # Need to transform hours in minutes
                _min = i * 60
        end
 
        # The quantity of tyme in human readable form (h:m)
        do
                # Need to transform hours in minutes
                _min = i * 60
        end
 
        # The quantity of tyme in human readable form (h:m)

-       redef meth to_s: String
+       redef fun to_s: String

        do
                var s = "{hour}:{min%60}"
                return s
        do
                var s = "{hour}:{min%60}"
                return s

diff --git a/tests/galerie.nit b/tests/galerie.nit
index 108b75e..9260d19 100644 (file)
--- a/tests/galerie.nit
+++ b/tests/galerie.nit
@@ -19,23 +19,23 @@
 import kernel
 
 class Client
 import kernel
 
 class Client

-       attr _credit: Int
+       var _credit: Int

        
        

-       meth regarde(t: Tableau)
+       fun regarde(t: Tableau)

        do
                if t.joli and _credit >= t.etiquette.prix then
                        achete(t)
                end
        end
        
        do
                if t.joli and _credit >= t.etiquette.prix then
                        achete(t)
                end
        end
        

-       meth achete(t: Tableau) is abstract
+       fun achete(t: Tableau) is abstract

 end
 
 class Tableau
 end
 
 class Tableau

-       meth joli: Bool is abstract
-       meth etiquette: Etiquette is abstract
+       fun joli: Bool is abstract
+       fun etiquette: Etiquette is abstract

 end
 
 class Etiquette
 end
 
 class Etiquette

-       meth prix: Int is abstract
+       fun prix: Int is abstract

 end
 end

diff --git a/tests/gccbug_attribute_access.nit b/tests/gccbug_attribute_access.nit
index e04ad13..d595cdf 100644 (file)
--- a/tests/gccbug_attribute_access.nit
+++ b/tests/gccbug_attribute_access.nit
@@ -21,8 +21,8 @@
 # * try to change the optimization flags
 # * try to update your gcc version
 class Foo
 # * try to change the optimization flags
 # * try to update your gcc version
 class Foo

-       attr _count: Int = 0
-       meth run: Int
+       var _count: Int = 0
+       fun run: Int

        do
                # Under some case gcc produce bad code here and make the if
                # evaluate the old _count value
        do
                # Under some case gcc produce bad code here and make the if
                # evaluate the old _count value

diff --git a/tests/module_0.nit b/tests/module_0.nit
index 0c5832c..f000062 100644 (file)
--- a/tests/module_0.nit
+++ b/tests/module_0.nit
@@ -17,23 +17,23 @@
 import end
 
 class Object
 import end
 
 class Object

-       meth output 
+       fun output 

        do
                0.output
        end
 
        do
                0.output
        end
 

-       meth print(a: Object)
+       fun print(a: Object)

        do
                a.output
        end
 end
 
 class Int
        do
                a.output
        end
 end
 
 class Int

-       redef meth output is intern
+       redef fun output is intern

 end
 
 class Sys
 end
 
 class Sys

-       meth main
+       fun main

        do
        end
 end
        do
        end
 end

diff --git a/tests/module_1.nit b/tests/module_1.nit
index 8f15e91..32f758a 100644 (file)
--- a/tests/module_1.nit
+++ b/tests/module_1.nit
@@ -17,22 +17,22 @@
 import module_0
 
 class A # class 1
 import module_0
 
 class A # class 1

-   meth a1 
+   fun a1 

    do 
           print(1)
           print(1)
    end
    do 
           print(1)
           print(1)
    end

-   meth a12 
+   fun a12 

    do
           print(12)
           print(1)
    end
    do
           print(12)
           print(1)
    end

-   meth a13
+   fun a13

    do
           print(13) 
           print(1)
    end
    do
           print(13) 
           print(1)
    end

-   meth a123 
+   fun a123 

    do
           print(123)
           print(1)
    do
           print(123)
           print(1)

@@ -41,24 +41,24 @@ end
 
 class B # class 2
 special A
 
 class B # class 2
 special A

-   redef meth a12 
+   redef fun a12 

    do
           print(12)
           print(2)
    end
    do
           print(12)
           print(2)
    end

-   redef meth a123
+   redef fun a123

    do
           print(123)
           print(2)
    end
    do
           print(123)
           print(2)
    end

-   meth all2
+   fun all2

    do
           a1
           a12
           a13
           a123
    end
    do
           a1
           a12
           a13
           a123
    end

-   meth all25
+   fun all25

    do
           print(250)
           print(2)
    do
           print(250)
           print(2)

diff --git a/tests/module_2.nit b/tests/module_2.nit
index 5c42c49..a7a944e 100644 (file)
--- a/tests/module_2.nit
+++ b/tests/module_2.nit
@@ -17,12 +17,12 @@
 import module_1
 
 redef class A # class 3
 import module_1
 
 redef class A # class 3

-   redef meth a13
+   redef fun a13

    do
           print(13)
           print(3)
    end
    do
           print(13)
           print(3)
    end

-   redef meth a123
+   redef fun a123

    do
           print(123)
           print(3)
    do
           print(123)
           print(3)

@@ -35,7 +35,7 @@ end
 
 class C # class 5
 special B
 
 class C # class 5
 special B

-   redef meth all25
+   redef fun all25

    do
           print(250)
           print(5)
    do
           print(250)
           print(5)

diff --git a/tests/module_simple.nit b/tests/module_simple.nit
index 14b2f75..e2e675c 100644 (file)
--- a/tests/module_simple.nit
+++ b/tests/module_simple.nit
@@ -15,18 +15,18 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth p(x: A, y: Int, z: Array[A]): A do return self end
-       meth q(x: A): A do return self end
+       fun p(x: A, y: Int, z: Array[A]): A do return self end
+       fun q(x: A): A do return self end

 end
 
 class B
 special A
 end
 
 class B
 special A

-       redef meth q(x: A): B do return self end
+       redef fun q(x: A): B do return self end

 end
 
 class C
 special B
 end
 
 class C
 special B

-       meth r(x: B) do end
-       meth s: B do return self end
-       attr _a: B
+       fun r(x: B) do end
+       fun s: B do return self end
+       var _a: B

 end
 end

diff --git a/tests/rterror_cov_param.nit b/tests/rterror_cov_param.nit
index 8f319cb..159b884 100644 (file)
--- a/tests/rterror_cov_param.nit
+++ b/tests/rterror_cov_param.nit
@@ -16,21 +16,21 @@
 
 import kernel
 class A
 
 import kernel
 class A

-       meth bar(a: Object)
+       fun bar(a: Object)

        do
                a.output
        end
        do
                a.output
        end

-       redef meth output
+       redef fun output

        do
                'A'.output
        end
 
        do
                'A'.output
        end
 

-       meth ret_test
+       fun ret_test

        # see rterror_cov_ret
        do
                ret.output
        end
        # see rterror_cov_ret
        do
                ret.output
        end

-       meth ret: A
+       fun ret: A

        do
                return self
        end
        do
                return self
        end

@@ -40,15 +40,15 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth bar(a: B)
+       redef fun bar(a: B)

        do
                a.output
        end
        do
                a.output
        end

-       redef meth output
+       redef fun output

        do
                'B'.output
        end
        do
                'B'.output
        end

-       redef meth ret: B
+       redef fun ret: B

        do
                return self
        end
        do
                return self
        end

diff --git a/tests/rterror_cov_ret.nit b/tests/rterror_cov_ret.nit
index df78433..bcdfdfe 100644 (file)
--- a/tests/rterror_cov_ret.nit
+++ b/tests/rterror_cov_ret.nit
@@ -16,7 +16,7 @@
 
 import rterror_cov_param
 redef class A
 
 import rterror_cov_param
 redef class A

-       redef meth ret: Object
+       redef fun ret: Object

        do
                return 5
        end
        do
                return 5
        end

diff --git a/tests/rterror_deep.nit b/tests/rterror_deep.nit
index bb9e93e..e44b923 100644 (file)
--- a/tests/rterror_deep.nit
+++ b/tests/rterror_deep.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo(i: Int)
+       fun foo(i: Int)

        do
                i.output
                if i == 1 then
        do
                i.output
                if i == 1 then

@@ -30,7 +30,7 @@ class A
                end
        end
 
                end
        end
 

-       meth bar(i: Int)
+       fun bar(i: Int)

        do
                foo(i/2)
        end
        do
                foo(i/2)
        end

@@ -40,7 +40,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth foo(i: Int)
+       redef fun foo(i: Int)

        do
                if i == 1 then
                        var a: A
        do
                if i == 1 then
                        var a: A

@@ -52,7 +52,7 @@ special A
        init do end
 end
 
        init do end
 end
 

-meth baz(a: A, i: Int)
+fun baz(a: A, i: Int)

 do
        a.foo(i+3)
 end
 do
        a.foo(i+3)
 end

diff --git a/tests/rterror_nilcall_attr.nit b/tests/rterror_nilcall_attr.nit
index dee06c7..b18e04d 100644 (file)
--- a/tests/rterror_nilcall_attr.nit
+++ b/tests/rterror_nilcall_attr.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class Foo
 import kernel
 
 class Foo

-       attr _attr: Object
+       var _attr: Object

 
        init do 
                _attr = 0
 
        init do 
                _attr = 0

diff --git a/tests/rterror_nilcall_mono.nit b/tests/rterror_nilcall_mono.nit
index 0fee817..66aef15 100644 (file)
--- a/tests/rterror_nilcall_mono.nit
+++ b/tests/rterror_nilcall_mono.nit
@@ -17,12 +17,12 @@
 import kernel
 
 class Foo
 import kernel
 
 class Foo

-       meth bar
+       fun bar

        do
                baz.output
        end
 
        do
                baz.output
        end
 

-       meth baz: Int
+       fun baz: Int

        do
                return 5
        end
        do
                return 5
        end

diff --git a/tests/rterror_nilcall_poly.nit b/tests/rterror_nilcall_poly.nit
index 03d9f02..6336ae9 100644 (file)
--- a/tests/rterror_nilcall_poly.nit
+++ b/tests/rterror_nilcall_poly.nit
@@ -17,28 +17,28 @@
 import kernel
 
 redef class Object
 import kernel
 
 redef class Object

-       meth foo
+       fun foo

        do
                0.output
        end
 end
 
 redef class Int
        do
                0.output
        end
 end
 
 redef class Int

-       redef meth foo
+       redef fun foo

        do
                output
        end
 end
 
 redef class Char
        do
                output
        end
 end
 
 redef class Char

-       redef meth foo
+       redef fun foo

        do
                ascii.foo
        end
 end
 
 class Foo
        do
                ascii.foo
        end
 end
 
 class Foo

-       redef meth foo
+       redef fun foo

        do
                5.output
        end
        do
                5.output
        end

@@ -47,7 +47,7 @@ class Foo
 end
 
 class Bar
 end
 
 class Bar

-       redef meth foo
+       redef fun foo

        do
                6.output
        end
        do
                6.output
        end

diff --git a/tests/rterror_nilcall_undead.nit b/tests/rterror_nilcall_undead.nit
index 7b29844..f2a11bf 100644 (file)
--- a/tests/rterror_nilcall_undead.nit
+++ b/tests/rterror_nilcall_undead.nit
@@ -17,11 +17,11 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

        do
                1.output
        end
        do
                1.output
        end

-       meth bar: Int
+       fun bar: Int

        do
                return 2
        end
        do
                return 2
        end

diff --git a/tests/sav/error_attr_2def.sav b/tests/sav/error_attr_2def.sav
index 37775c2..4259721 100644 (file)
--- a/tests/sav/error_attr_2def.sav
+++ b/tests/sav/error_attr_2def.sav
@@ -1 +1 @@
-./error_attr_2def.nit:19,2--19: Error: A property _toto is already defined in class A.
+./error_attr_2def.nit:19,2--18: Error: A property _toto is already defined in class A.

diff --git a/tests/sav/error_defs_alt1.sav b/tests/sav/error_defs_alt1.sav
index b40ecce..2e1f7d7 100644 (file)
--- a/tests/sav/error_defs_alt1.sav
+++ b/tests/sav/error_defs_alt1.sav
@@ -1 +1 @@
-alt/error_defs_alt1.nit:19,1--20:33: Redef error: Object is an imported class. Add the redef keyword to refine it.
+alt/error_defs_alt1.nit:19,1--20:32: Redef error: Object is an imported class. Add the redef keyword to refine it.

diff --git a/tests/sav/error_defs_alt2.sav b/tests/sav/error_defs_alt2.sav
index 4e4d510..39b7324 100644 (file)
--- a/tests/sav/error_defs_alt2.sav
+++ b/tests/sav/error_defs_alt2.sav
@@ -1 +1 @@
-alt/error_defs_alt2.nit:26,2--40: Error: A property foo is already defined in class A.
+alt/error_defs_alt2.nit:26,2--39: Error: A property foo is already defined in class A.

diff --git a/tests/sav/error_defs_alt3.sav b/tests/sav/error_defs_alt3.sav
index 43cddb1..c723424 100644 (file)
--- a/tests/sav/error_defs_alt3.sav
+++ b/tests/sav/error_defs_alt3.sav
@@ -1 +1 @@
-alt/error_defs_alt3.nit:26,1--27:33: Redef error: A::bar is an inherited property. To redefine it, add the redef keyword.
+alt/error_defs_alt3.nit:26,1--27:32: Redef error: A::bar is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_defs_alt4.sav b/tests/sav/error_defs_alt4.sav
index 175ce2e..f8a8283 100644 (file)
--- a/tests/sav/error_defs_alt4.sav
+++ b/tests/sav/error_defs_alt4.sav
@@ -1 +1 @@
-alt/error_defs_alt4.nit:28,1--29:30: Redef error: A::baz is an inherited property. To redefine it, add the redef keyword.
+alt/error_defs_alt4.nit:28,1--29:29: Redef error: A::baz is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_defs_alt5.sav b/tests/sav/error_defs_alt5.sav
index 7ffb08b..69abf33 100644 (file)
--- a/tests/sav/error_defs_alt5.sav
+++ b/tests/sav/error_defs_alt5.sav
@@ -1,2 +1,2 @@
-alt/error_defs_alt5.nit:28,1--30:36: Redef error: A::baz redefines Object::baz with 0 parameter(s).
-alt/error_defs_alt5.nit:28,1--30:36: Redef error: The procedure A::baz redefines the function Object::baz.
+alt/error_defs_alt5.nit:28,1--30:35: Redef error: A::baz redefines Object::baz with 0 parameter(s).
+alt/error_defs_alt5.nit:28,1--30:35: Redef error: The procedure A::baz redefines the function Object::baz.

diff --git a/tests/sav/error_defs_alt6.sav b/tests/sav/error_defs_alt6.sav
index 164869d..304f9b6 100644 (file)
--- a/tests/sav/error_defs_alt6.sav
+++ b/tests/sav/error_defs_alt6.sav
@@ -1 +1 @@
-alt/error_defs_alt6.nit:35,1--36:34: Error: A class A is already defined at line 24.
+alt/error_defs_alt6.nit:35,1--36:33: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_defs_alt7.sav b/tests/sav/error_defs_alt7.sav
index 86ba9e9..b2dc6ba 100644 (file)
--- a/tests/sav/error_defs_alt7.sav
+++ b/tests/sav/error_defs_alt7.sav
@@ -1 +1 @@
-alt/error_defs_alt7.nit:35,1--39:34: Error: A class A is already defined at line 24.
+alt/error_defs_alt7.nit:35,1--39:33: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_defs_alt8.sav b/tests/sav/error_defs_alt8.sav
index 8d39807..e4c28b9 100644 (file)
--- a/tests/sav/error_defs_alt8.sav
+++ b/tests/sav/error_defs_alt8.sav
@@ -1 +1 @@
-alt/error_defs_alt8.nit:35,1--42:40: Error: A class A is already defined at line 24.
+alt/error_defs_alt8.nit:35,1--42:39: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_formal.sav b/tests/sav/error_formal.sav
index 0cc465f..9b524f1 100644 (file)
--- a/tests/sav/error_formal.sav
+++ b/tests/sav/error_formal.sav
@@ -1 +1 @@
-./error_formal.nit:18,11--15: Type error: formal type T cannot have formal parameters.
+./error_formal.nit:18,10--14: Type error: formal type T cannot have formal parameters.

diff --git a/tests/sav/error_fun_ret.sav b/tests/sav/error_fun_ret.sav
index da219e4..fb6ebcf 100644 (file)
--- a/tests/sav/error_fun_ret.sav
+++ b/tests/sav/error_fun_ret.sav
@@ -1 +1 @@
-./error_fun_ret.nit:17,1--14: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret.nit:17,1--13: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_kern_attr_any.sav b/tests/sav/error_kern_attr_any.sav
index d042266..e16871e 100644 (file)
--- a/tests/sav/error_kern_attr_any.sav
+++ b/tests/sav/error_kern_attr_any.sav
@@ -1 +1 @@
-./error_kern_attr_any.nit:18,2--17: Error: Attempt to define attribute _toto in the interface Object.
+./error_kern_attr_any.nit:18,2--16: Error: Attempt to define attribute _toto in the interface Object.

diff --git a/tests/sav/error_kern_attr_int.sav b/tests/sav/error_kern_attr_int.sav
index c74f6c6..3c595a3 100644 (file)
--- a/tests/sav/error_kern_attr_int.sav
+++ b/tests/sav/error_kern_attr_int.sav
@@ -1 +1 @@
-./error_kern_attr_int.nit:18,2--19: Error: Attempt to define attribute _toto in the universal class Int.
+./error_kern_attr_int.nit:18,2--18: Error: Attempt to define attribute _toto in the universal class Int.

diff --git a/tests/sav/error_meth_2def.sav b/tests/sav/error_meth_2def.sav
index 6258904..c96f27e 100644 (file)
--- a/tests/sav/error_meth_2def.sav
+++ b/tests/sav/error_meth_2def.sav
@@ -1 +1 @@
-./error_meth_2def.nit:19,2--18: Error: A property toto is already defined in class A.
+./error_meth_2def.nit:19,2--17: Error: A property toto is already defined in class A.

diff --git a/tests/sav/error_meth_2def2.sav b/tests/sav/error_meth_2def2.sav
index b2c0f94..7f3188f 100644 (file)
--- a/tests/sav/error_meth_2def2.sav
+++ b/tests/sav/error_meth_2def2.sav
@@ -1 +1 @@
-./error_meth_2def2.nit:19,2--35: Error: A property toto is already defined in class A.
+./error_meth_2def2.nit:19,2--34: Error: A property toto is already defined in class A.

diff --git a/tests/sav/error_ref_attr.sav b/tests/sav/error_ref_attr.sav
index ef85836..f4d8101 100644 (file)
--- a/tests/sav/error_ref_attr.sav
+++ b/tests/sav/error_ref_attr.sav
@@ -1 +1 @@
-./error_ref_attr.nit:20,2--19: Redef error: Expected B (as in C::_a), got Int in C::_a.
+./error_ref_attr.nit:20,2--18: Redef error: Expected B (as in C::_a), got Int in C::_a.

diff --git a/tests/sav/error_ref_fun.sav b/tests/sav/error_ref_fun.sav
index 4018472..901984b 100644 (file)
--- a/tests/sav/error_ref_fun.sav
+++ b/tests/sav/error_ref_fun.sav
@@ -1 +1 @@
-./error_ref_fun.nit:20,2--13: Control error: Reached end of function (a 'return' with a value was expected).
+./error_ref_fun.nit:20,2--12: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_ref_proc.sav b/tests/sav/error_ref_proc.sav
index 671b7f1..a679188 100644 (file)
--- a/tests/sav/error_ref_proc.sav
+++ b/tests/sav/error_ref_proc.sav
@@ -1 +1 @@
-./error_ref_proc.nit:20,2--37: Redef error: The function C::r redefines the procedure C::r.
+./error_ref_proc.nit:20,2--36: Redef error: The function C::r redefines the procedure C::r.

diff --git a/tests/sav/error_ref_ret.sav b/tests/sav/error_ref_ret.sav
index 71f111f..6d83b27 100644 (file)
--- a/tests/sav/error_ref_ret.sav
+++ b/tests/sav/error_ref_ret.sav
@@ -1 +1 @@
-./error_ref_ret.nit:20,2--30: Redef error: Expected B (as in C::s), got Int in C::s.
+./error_ref_ret.nit:20,2--29: Redef error: Expected B (as in C::s), got Int in C::s.

diff --git a/tests/sav/error_spe_attr.sav b/tests/sav/error_spe_attr.sav
index 324631b..b518ad1 100644 (file)
--- a/tests/sav/error_spe_attr.sav
+++ b/tests/sav/error_spe_attr.sav
@@ -1 +1 @@
-./error_spe_attr.nit:22,2--22: Redef error: Expected Int (as in A::_a), got Object in B::_a.
+./error_spe_attr.nit:22,2--21: Redef error: Expected Int (as in A::_a), got Object in B::_a.

diff --git a/tests/sav/error_spe_fun.sav b/tests/sav/error_spe_fun.sav
index 4d47359..daab3fd 100644 (file)
--- a/tests/sav/error_spe_fun.sav
+++ b/tests/sav/error_spe_fun.sav
@@ -1 +1 @@
-./error_spe_fun.nit:23,1--15: Control error: Reached end of function (a 'return' with a value was expected).
+./error_spe_fun.nit:23,1--14: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_spe_param.sav b/tests/sav/error_spe_param.sav
index a6ca6d5..32f94b5 100644 (file)
--- a/tests/sav/error_spe_param.sav
+++ b/tests/sav/error_spe_param.sav
@@ -1 +1 @@
-./error_spe_param.nit:24,1--25: Redef error: Expected Int (as in A::toto), got Object in B::toto.
+./error_spe_param.nit:24,1--24: Redef error: Expected Int (as in A::toto), got Object in B::toto.

diff --git a/tests/sav/error_spe_param2.sav b/tests/sav/error_spe_param2.sav
index 71cc328..39a8177 100644 (file)
--- a/tests/sav/error_spe_param2.sav
+++ b/tests/sav/error_spe_param2.sav
@@ -1 +1 @@
-./error_spe_param2.nit:24,1--23: Redef error: Expected Int (as in A::toto), got Char in B::toto.
+./error_spe_param2.nit:24,1--22: Redef error: Expected Int (as in A::toto), got Char in B::toto.

diff --git a/tests/sav/error_spe_proc.sav b/tests/sav/error_spe_proc.sav
index 00f021b..cccbec6 100644 (file)
--- a/tests/sav/error_spe_proc.sav
+++ b/tests/sav/error_spe_proc.sav
@@ -1 +1 @@
-./error_spe_proc.nit:23,1--32: Redef error: The function B::toto redefines the procedure A::toto.
+./error_spe_proc.nit:23,1--31: Redef error: The function B::toto redefines the procedure A::toto.

diff --git a/tests/sav/error_spe_ret.sav b/tests/sav/error_spe_ret.sav
index fd18496..c249b92 100644 (file)
--- a/tests/sav/error_spe_ret.sav
+++ b/tests/sav/error_spe_ret.sav
@@ -1 +1 @@
-./error_spe_ret.nit:23,1--35: Redef error: Expected Int (as in A::toto), got Char in B::toto.
+./error_spe_ret.nit:23,1--34: Redef error: Expected Int (as in A::toto), got Char in B::toto.

diff --git a/tests/sav/test_multiconstraint_inh.sav b/tests/sav/test_multiconstraint_inh.sav
index fff3a83..35efa63 100644 (file)
--- a/tests/sav/test_multiconstraint_inh.sav
+++ b/tests/sav/test_multiconstraint_inh.sav
@@ -1 +1 @@
-./test_multiconstraint_inh.nit:39,4--32: Redef error: Expected I[A] (as in G::baz), got J in H::baz.
+./test_multiconstraint_inh.nit:39,4--31: Redef error: Expected I[A] (as in G::baz), got J in H::baz.

diff --git a/tests/shootout_ackermann.nit b/tests/shootout_ackermann.nit
index ade7f93..da3b06b 100644 (file)
--- a/tests/shootout_ackermann.nit
+++ b/tests/shootout_ackermann.nit
@@ -19,7 +19,7 @@
 #
 # contributed by Jean Privat
 
 #
 # contributed by Jean Privat
 

-meth ack(m: Int, n: Int): Int
+fun ack(m: Int, n: Int): Int

     do
        if m == 0 then
            return n + 1
     do
        if m == 0 then
            return n + 1

diff --git a/tests/shootout_binarytrees.nit b/tests/shootout_binarytrees.nit
index 5416e6a..6ccd4be 100644 (file)
--- a/tests/shootout_binarytrees.nit
+++ b/tests/shootout_binarytrees.nit
@@ -20,9 +20,9 @@
 # contributed by Jean Privat
 
 class TreeNode
 # contributed by Jean Privat
 
 class TreeNode

-    attr _left: nullable TreeNode
-    attr _right: nullable TreeNode
-    attr _item: Int
+    var _left: nullable TreeNode
+    var _right: nullable TreeNode
+    var _item: Int

 
 
     init(left: nullable TreeNode, right: nullable TreeNode, item: Int)
 
 
     init(left: nullable TreeNode, right: nullable TreeNode, item: Int)

@@ -33,7 +33,7 @@ class TreeNode
        end
 
 
        end
 
 

-    meth item_check: Int
+    fun item_check: Int

        do
            if _left == null then
                return _item
        do
            if _left == null then
                return _item

@@ -43,7 +43,7 @@ class TreeNode
        end
 end
 
        end
 end
 

-meth bottom_up_tree(item: Int, depth: Int): TreeNode
+fun bottom_up_tree(item: Int, depth: Int): TreeNode

     do
        if depth > 0 then
            var item_item = 2 * item
     do
        if depth > 0 then
            var item_item = 2 * item

diff --git a/tests/shootout_nsieve.nit b/tests/shootout_nsieve.nit
index 0e2542b..b84da54 100644 (file)
--- a/tests/shootout_nsieve.nit
+++ b/tests/shootout_nsieve.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth nsieve(n: Int): Int
+fun nsieve(n: Int): Int

 do
        var count = 0
        var array = new Buffer.with_capacity(n)
 do
        var count = 0
        var array = new Buffer.with_capacity(n)

@@ -34,7 +34,7 @@ do
        return count
 end
 
        return count
 end
 

-meth test(n: Int)
+fun test(n: Int)

 do
        var m = 10000.lshift(n)
        print("Primes up to {m} {nsieve(m)}")
 do
        var m = 10000.lshift(n)
        print("Primes up to {m} {nsieve(m)}")

diff --git a/tests/shootout_pidigits.nit b/tests/shootout_pidigits.nit
index 8f27655..8ed7ffa 100644 (file)
--- a/tests/shootout_pidigits.nit
+++ b/tests/shootout_pidigits.nit
@@ -22,9 +22,9 @@
 # Incorrect without bignums
 
 class PiDigitSpigot
 # Incorrect without bignums
 
 class PiDigitSpigot

-    attr _z: Transformation
-    attr _x: Transformation
-    attr _inverse: Transformation
+    var _z: Transformation
+    var _x: Transformation
+    var _inverse: Transformation

     
 
     init
     
 
     init

@@ -35,7 +35,7 @@ class PiDigitSpigot
        end
 
 
        end
 
 

-    meth next: Int
+    fun next: Int

        do
            var y = digit
            if is_safe(y) then
        do
            var y = digit
            if is_safe(y) then

@@ -47,7 +47,7 @@ class PiDigitSpigot
            end
        end
        
            end
        end
        

-    meth next_: Int
+    fun next_: Int

        do
            var y = digit
            while not is_safe(y) do
        do
            var y = digit
            while not is_safe(y) do

@@ -58,22 +58,22 @@ class PiDigitSpigot
            return y
        end
 
            return y
        end
 

-    meth digit: Int
+    fun digit: Int

        do
            return _z.extract(3)
        end
 
        do
            return _z.extract(3)
        end
 

-    meth is_safe(digit: Int): Bool
+    fun is_safe(digit: Int): Bool

        do
            return digit == _z.extract(4)
        end
 
        do
            return digit == _z.extract(4)
        end
 

-    meth produce(i: Int): Transformation
+    fun produce(i: Int): Transformation

        do
            return _inverse.qrst(10,-10*i,0,1).compose(_z)
        end
 
        do
            return _inverse.qrst(10,-10*i,0,1).compose(_z)
        end
 

-    meth consume(a: Transformation): Transformation
+    fun consume(a: Transformation): Transformation

        do
            return _z.compose(a)
        end
        do
            return _z.compose(a)
        end

@@ -81,18 +81,18 @@ end
 
 
 class Transformation
 
 
 class Transformation

-    attr _q: Int
-    attr _r: Int
-    attr _s: Int
-    attr _t: Int
-    attr _k: Int
+    var _q: Int
+    var _r: Int
+    var _s: Int
+    var _t: Int
+    var _k: Int

 
     init(q: Int, r: Int, s: Int, t: Int)
         do
            set(q, r, s, t)
        end
 
 
     init(q: Int, r: Int, s: Int, t: Int)
         do
            set(q, r, s, t)
        end
 

-    meth set(q: Int, r: Int, s: Int, t: Int)
+    fun set(q: Int, r: Int, s: Int, t: Int)

        do
            _q = q
            _r = r
        do
            _q = q
            _r = r

@@ -102,7 +102,7 @@ class Transformation
        end
 
 
        end
 
 

-    meth next: Transformation
+    fun next: Transformation

        do
            _k = _k + 1
            _q = _k
        do
            _k = _k + 1
            _q = _k

@@ -112,12 +112,12 @@ class Transformation
            return self
        end
 
            return self
        end
 

-    meth extract(j: Int): Int
+    fun extract(j: Int): Int

        do
            return (_q * j + _r) / (_s * j + _t)
        end
 
        do
            return (_q * j + _r) / (_s * j + _t)
        end
 

-    meth compose(a: Transformation): Transformation
+    fun compose(a: Transformation): Transformation

        do
            return new Transformation(
                _q * a._q,
        do
            return new Transformation(
                _q * a._q,

@@ -127,7 +127,7 @@ class Transformation
                )
        end
 
                )
        end
 

-    meth qrst(q: Int, r: Int, s: Int, t: Int): Transformation
+    fun qrst(q: Int, r: Int, s: Int, t: Int): Transformation

        do
            set(q, r, s, t)
            return self
        do
            set(q, r, s, t)
            return self

diff --git a/tests/simple.nit b/tests/simple.nit
index ec6d99c..5a36ca9 100644 (file)
--- a/tests/simple.nit
+++ b/tests/simple.nit
@@ -17,13 +17,13 @@
 import module_0
 
 redef class Sys
 import module_0
 
 redef class Sys

-   attr _a: Object
-   attr _b: Int
-   meth printn(i: Object)
+   var _a: Object
+   var _b: Int
+   fun printn(i: Object)

       do
          i.output
       end
       do
          i.output
       end

-   redef meth main
+   redef fun main

       do
          _a = 53
          _b = 53
       do
          _a = 53
          _b = 53

diff --git a/tests/sol.nit b/tests/sol.nit
index 8ecc063..073423a 100644 (file)
--- a/tests/sol.nit
+++ b/tests/sol.nit
@@ -19,7 +19,7 @@ import game
 
 class Playing
 special SDL_EventListener
 
 class Playing
 special SDL_EventListener

-       redef meth on_mouse_button(evt: SDL_MouseButtonEvent)
+       redef fun on_mouse_button(evt: SDL_MouseButtonEvent)

        do
                if evt.is_pressed then
                        if evt.button == 1 then
        do
                if evt.is_pressed then
                        if evt.button == 1 then

@@ -34,21 +34,21 @@ special SDL_EventListener
                end
        end
 
                end
        end
 

-       redef meth on_mouse_motion(evt: SDL_MouseMotionEvent)
+       redef fun on_mouse_motion(evt: SDL_MouseMotionEvent)

        do
                _mouse_x = evt.x
                _mouse_y = evt.y
        end
 
        do
                _mouse_x = evt.x
                _mouse_y = evt.y
        end
 

-       redef meth on_quit
+       redef fun on_quit

        do
                _quit_requested = true
        end
 
        do
                _quit_requested = true
        end
 

-       readable attr _quit_requested: Bool 
+       readable var _quit_requested: Bool 

 
 

-       attr _last_t: Int
-       meth update
+       var _last_t: Int
+       fun update

        do
                var t = sdl_get_ticks   # Current time (ms)
                var quantum = 10        # Quantum of time (ms) for one step
        do
                var t = sdl_get_ticks   # Current time (ms)
                var quantum = 10        # Quantum of time (ms) for one step

@@ -73,7 +73,7 @@ special SDL_EventListener
        end
 
 private
        end
 
 private

-       meth update_one_step
+       fun update_one_step

        do
                var mx = _mouse_x
                var my = _mouse_y
        do
                var mx = _mouse_x
                var my = _mouse_y

@@ -116,12 +116,12 @@ private
                end
        end
 
                end
        end
 

-       meth update_draw(frames: Int)
+       fun update_draw(frames: Int)

        do
                _player.update_draw(frames)
        end
 
        do
                _player.update_draw(frames)
        end
 

-       meth draw
+       fun draw

        do
                _screen.clear
                for b in _boxes do
        do
                _screen.clear
                for b in _boxes do

@@ -134,7 +134,7 @@ private
                _screen.flip
        end
 
                _screen.flip
        end
 

-       private meth load_level(l: Int)
+       private fun load_level(l: Int)

        do
                _level = l
                _boxes.clear
        do
                _level = l
                _boxes.clear

@@ -150,7 +150,7 @@ private
                init_level(lev.data)
        end
 
                init_level(lev.data)
        end
 

-       private meth init_level(s: String)
+       private fun init_level(s: String)

        do
                var height = 1
                var width = 0
        do
                var height = 1
                var width = 0

@@ -189,17 +189,17 @@ private
        end
 
 private
        end
 
 private

-       attr _screen: SDL_Screen
+       var _screen: SDL_Screen

 
 

-       attr _mouse_x: Int
-       attr _mouse_y: Int
+       var _mouse_x: Int
+       var _mouse_y: Int

 
 

-       attr _fps: TickCounter
-       attr _player: Player
-       attr _boxes: Array[Box]
-       attr _others: Array[Particle]
+       var _fps: TickCounter
+       var _player: Player
+       var _boxes: Array[Box]
+       var _others: Array[Particle]

 
 

-       attr _level: Int
+       var _level: Int

        
 
 
        
 
 

@@ -221,7 +221,7 @@ private
 end
 
 redef class Sprite
 end
 
 redef class Sprite

-       private meth load_images(name: String, number: Int): Array[SDL_Surface]
+       private fun load_images(name: String, number: Int): Array[SDL_Surface]

        do
                print("load images '{name}' ({number})")
                var res = new Array[SDL_Surface].with_capacity(number)
        do
                print("load images '{name}' ({number})")
                var res = new Array[SDL_Surface].with_capacity(number)

@@ -241,17 +241,17 @@ end
 
 class MovingSprite
 special Sprite
 
 class MovingSprite
 special Sprite

-       attr _rx: Float # Real X axis (sub-pixel)
-       attr _ry: Float # Real Y axix (sub-pixel)
-       readable attr _vx: Float # X velocity (speed)
-       readable attr _vy: Float # Y velovity (speed)
+       var _rx: Float # Real X axis (sub-pixel)
+       var _ry: Float # Real Y axix (sub-pixel)
+       readable var _vx: Float # X velocity (speed)
+       readable var _vy: Float # Y velovity (speed)

        
        

-       redef meth x=(x: Int)
+       redef fun x=(x: Int)

        do
                _x = x
                _rx = x.to_f
        end
        do
                _x = x
                _rx = x.to_f
        end

-       redef meth y=(y: Int)
+       redef fun y=(y: Int)

        do
                _y = y
                _ry = y.to_f
        do
                _y = y
                _ry = y.to_f

@@ -261,7 +261,7 @@ end
 class Player
 special MovingSprite
 
 class Player
 special MovingSprite
 

-       meth update_one_step(mx: Int, my: Int)
+       fun update_one_step(mx: Int, my: Int)

        do
                var vx = _vx
                var vy = _vy
        do
                var vx = _vx
                var vy = _vy

@@ -315,7 +315,7 @@ special MovingSprite
                _y = ry.to_i
        end
 
                _y = ry.to_i
        end
 

-       meth update_draw(frames: Int)
+       fun update_draw(frames: Int)

        do
                var a = - atan2(_vx, _vy)
                var x = ((a / 2.0 / pi + 0.5) * 16.0 + 0.5).to_i % 16
        do
                var a = - atan2(_vx, _vy)
                var x = ((a / 2.0 / pi + 0.5) * 16.0 + 0.5).to_i % 16

@@ -334,9 +334,9 @@ special MovingSprite
                _image_number = inum
        end
 
                _image_number = inum
        end
 

-       attr _boost: Bool 
-       attr _images: Array[Array[SDL_Surface]]
-       attr _image_number: Int
+       var _boost: Bool 
+       var _images: Array[Array[SDL_Surface]]
+       var _image_number: Int

        
 
        init(x: Int, y: Int)
        
 
        init(x: Int, y: Int)

@@ -349,7 +349,7 @@ special MovingSprite
                set_centered_image(_images.first.first)
                #set_centered_image(once sdl_load_bmp("data/ship-up.png"))
        end
                set_centered_image(_images.first.first)
                #set_centered_image(once sdl_load_bmp("data/ship-up.png"))
        end

-       meth load_ship_images: Array[Array[SDL_Surface]]
+       fun load_ship_images: Array[Array[SDL_Surface]]

        do
                var res = new Array[Array[SDL_Surface]]
                for i in ["up", "22", "45", "68", "90", "112", "135", "158", "180", "202", "225", "248", "270", "292", "315", "338"] do
        do
                var res = new Array[Array[SDL_Surface]]
                for i in ["up", "22", "45", "68", "90", "112", "135", "158", "180", "202", "225", "248", "270", "292", "315", "338"] do

@@ -362,12 +362,12 @@ end
 
 class Box
 special Sprite
 
 class Box
 special Sprite

-       attr _images: Array[SDL_Surface]
-       attr _image_number: Int
-       attr _image_delay: Int
-       attr _back_rotate: Bool
+       var _images: Array[SDL_Surface]
+       var _image_number: Int
+       var _image_delay: Int
+       var _back_rotate: Bool

 
 

-       meth update_one_step
+       fun update_one_step

        do
                _image_delay = _image_delay + 1
                if _image_delay > 0 and _image_delay % 8 == 0 then
        do
                _image_delay = _image_delay + 1
                if _image_delay > 0 and _image_delay % 8 == 0 then

@@ -384,14 +384,14 @@ special Sprite
                end
        end
 
                end
        end
 

-       redef meth blit_on(s: SDL_Surface)
+       redef fun blit_on(s: SDL_Surface)

        do
                if _image_delay > 0 then
                        _image.blit_on_xy(s, _x - _x_image, _y - _y_image)
                end
        end
 
        do
                if _image_delay > 0 then
                        _image.blit_on_xy(s, _x - _x_image, _y - _y_image)
                end
        end
 

-       meth gettable: Bool
+       fun gettable: Bool

        do
                return _image_delay > 0
        end
        do
                return _image_delay > 0
        end

@@ -412,7 +412,7 @@ end
 
 class Particle
 special MovingSprite
 
 class Particle
 special MovingSprite

-       meth update_one_step: Bool
+       fun update_one_step: Bool

        do
                _ttl = _ttl - 1
                if _ttl < 0 then
        do
                _ttl = _ttl - 1
                if _ttl < 0 then

@@ -432,8 +432,8 @@ special MovingSprite
                return false
        end
 
                return false
        end
 

-       attr _ttl: Int
-       attr _images: Array[SDL_Surface]
+       var _ttl: Int
+       var _images: Array[SDL_Surface]

 
 
        init(x: Int, y: Int, vx: Float, vy: Float, ttl: Int)
 
 
        init(x: Int, y: Int, vx: Float, vy: Float, ttl: Int)

@@ -448,11 +448,11 @@ special MovingSprite
 end
 
 class Level
 end
 
 class Level

-       readable attr _number: Int 
-       readable attr _name: String 
-       readable attr _data: String 
+       readable var _number: Int 
+       readable var _name: String 
+       readable var _data: String 

 
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return "level {_number}"
        end
        do
                return "level {_number}"
        end

@@ -466,7 +466,7 @@ class Level
        end
 end
 
        end
 end
 

-meth load_levels(filename: String): Array[Level]
+fun load_levels(filename: String): Array[Level]

 do
        var levels = new Array[Level]
        var f = new IFStream.open(filename)
 do
        var levels = new Array[Level]
        var f = new IFStream.open(filename)

diff --git a/tests/test_accessor.nit b/tests/test_accessor.nit
index c470c66..e83de63 100644 (file)
--- a/tests/test_accessor.nit
+++ b/tests/test_accessor.nit
@@ -15,11 +15,11 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-   meth p=(i: Int)
+   fun p=(i: Int)

    do
       printn("p: ", i)
    end
    do
       printn("p: ", i)
    end

-   meth q=(i: Int, j: Int)
+   fun q=(i: Int, j: Int)

    do
       printn("q: ", i, j)
    end
    do
       printn("q: ", i, j)
    end

diff --git a/tests/test_array.nit b/tests/test_array.nit
index c64f692..fcce3bb 100644 (file)
--- a/tests/test_array.nit
+++ b/tests/test_array.nit
@@ -16,7 +16,7 @@
 
 
 class Ant
 
 
 class Ant

-       redef meth to_s: String
+       redef fun to_s: String

        do
                return "*"
        end
        do
                return "*"
        end

diff --git a/tests/test_attr.nit b/tests/test_attr.nit
index cd76791..36bc108 100644 (file)
--- a/tests/test_attr.nit
+++ b/tests/test_attr.nit
@@ -15,9 +15,9 @@
 # limitations under the License.
 
 redef class Sys
 # limitations under the License.
 
 redef class Sys

-       attr _i: Int
-       attr _j: Int
-       redef meth main
+       var _i: Int
+       var _j: Int
+       redef fun main

        do
                printn(5)
                _i = 5
        do
                printn(5)
                _i = 5

diff --git a/tests/test_attr_long.nit b/tests/test_attr_long.nit
index b29a1aa..1444e23 100644 (file)
--- a/tests/test_attr_long.nit
+++ b/tests/test_attr_long.nit
@@ -15,14 +15,14 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       attr _a_: Int = 0
+       var _a_: Int = 0

 
 

-       meth a: Int
+       fun a: Int

        do
                return _a_ * 10
        end
 
        do
                return _a_ * 10
        end
 

-       meth a=(a: Int)
+       fun a=(a: Int)

        do
                _a_ = a / 10
        end
        do
                _a_ = a / 10
        end

diff --git a/tests/test_boxing.nit b/tests/test_boxing.nit
index 6501016..2263140 100644 (file)
--- a/tests/test_boxing.nit
+++ b/tests/test_boxing.nit
@@ -18,8 +18,8 @@
 # By Flop
 
 class Gene[T]
 # By Flop
 
 class Gene[T]

-       readable attr _a_ : T 
-       meth a: T
+       readable var _a_ : T 
+       fun a: T

        do
                return _a_
        end
        do
                return _a_
        end

@@ -28,7 +28,7 @@ class Gene[T]
 
 end
 class GeneBool special Gene[Bool]
 
 end
 class GeneBool special Gene[Bool]

-       meth a=(b: Bool)
+       fun a=(b: Bool)

        do
                _a_ = b
        end
        do
                _a_ = b
        end

diff --git a/tests/test_calls.nit b/tests/test_calls.nit
index 6e097be..bd2ca0b 100644 (file)
--- a/tests/test_calls.nit
+++ b/tests/test_calls.nit
@@ -15,11 +15,11 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth foo
+       fun foo

        do
                1.output
        end
        do
                1.output
        end

-       meth bar
+       fun bar

        do
                foo
        end
        do
                foo
        end

@@ -29,7 +29,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth foo
+       redef fun foo

        do
                2.output
        end
        do
                2.output
        end

@@ -39,7 +39,7 @@ end
 
 class C
 special B
 
 class C
 special B

-       meth baz
+       fun baz

        do
                bar
        end
        do
                bar
        end

diff --git a/tests/test_closure_inlined_return.nit b/tests/test_closure_inlined_return.nit
index b172ba5..f992dd7 100644 (file)
--- a/tests/test_closure_inlined_return.nit
+++ b/tests/test_closure_inlined_return.nit
@@ -1,4 +1,4 @@
-meth foo with k
+fun foo with k

 do
        ' '.output
        '<'.output
 do
        ' '.output
        '<'.output

@@ -9,7 +9,7 @@ do
        1.output
 end
 
        1.output
 end
 

-meth test
+fun test

 do
        var a = [10, 20, 30]
        '<'.output
 do
        var a = [10, 20, 30]
        '<'.output

diff --git a/tests/test_coll.nit b/tests/test_coll.nit
index 606e1ef..26bcc87 100644 (file)
--- a/tests/test_coll.nit
+++ b/tests/test_coll.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth test_coll(c: IndexedCollection[Object], e: Object...)
+fun test_coll(c: IndexedCollection[Object], e: Object...)

     do
        print("c: {c.to_s.is_empty}")
        print("empty: {c.is_empty}")
     do
        print("c: {c.to_s.is_empty}")
        print("empty: {c.is_empty}")

diff --git a/tests/test_combined_assignment.nit b/tests/test_combined_assignment.nit
index 7371a8a..58f6da3 100644 (file)
--- a/tests/test_combined_assignment.nit
+++ b/tests/test_combined_assignment.nit
@@ -15,30 +15,30 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       readable writable attr _a: Int = 0#!alt1#
-       #alt1#readable writable attr _a: Object = 0
+       readable writable var _a: Int = 0#!alt1#
+       #alt1#readable writable var _a: Object = 0

        init do end
        init do end

-       meth foo
+       fun foo

        do
                _a += 2
        end
 
        do
                _a += 2
        end
 

-       meth next: Int
+       fun next: Int

        do
                _a += 1
                return a
        end
 
        do
                _a += 1
                return a
        end
 

-       meth [](a: Int): Int do return a
-       meth []=(a: Int, b: Int) do print "{a} {b}"
+       fun [](a: Int): Int do return a
+       fun []=(a: Int, b: Int) do print "{a} {b}"

 end
 
 redef class Int
 end
 
 redef class Int

-       meth sum(o: Int): Int do 
+       fun sum(o: Int): Int do 

                print "{self} + {o} = {self + o}?"
                return self + o
        end
                print "{self} + {o} = {self + o}?"
                return self + o
        end

-       meth sum=(o: Int, r: Int) do print "{self} + {o} = {r}!"
+       fun sum=(o: Int, r: Int) do print "{self} + {o} = {r}!"

 end
 
 var a = new A
 end
 
 var a = new A

diff --git a/tests/test_create.nit b/tests/test_create.nit
index 2eea360..b25b637 100644 (file)
--- a/tests/test_create.nit
+++ b/tests/test_create.nit
@@ -17,15 +17,15 @@
 import kernel
 
 redef class Object
 import kernel
 
 redef class Object

-       meth printn(a: Object)
+       fun printn(a: Object)

        do
                a.output
        end
 end
 
 class Toto
        do
                a.output
        end
 end
 
 class Toto

-       attr _a: Int
-       redef meth output
+       var _a: Int
+       redef fun output

        do
                printn(_a)
        end
        do
                printn(_a)
        end

@@ -47,7 +47,7 @@ class Toto
 end
 
 class Test
 end
 
 class Test

-       attr _t: Toto
+       var _t: Toto

 
        init
        do
 
        init
        do

diff --git a/tests/test_create_more.nit b/tests/test_create_more.nit
index b8d555a..4d1951f 100644 (file)
--- a/tests/test_create_more.nit
+++ b/tests/test_create_more.nit
@@ -15,26 +15,26 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       attr _attribute: nullable A
-       attr _num: Char
+       var _attribute: nullable A
+       var _num: Char

 
 

-       meth foo=(a: nullable A)
+       fun foo=(a: nullable A)

        do
                _attribute = a
        end
 
        do
                _attribute = a
        end
 

-       meth foo: nullable A
+       fun foo: nullable A

        do
                return _attribute
        end
 
        do
                return _attribute
        end
 

-       meth bar=(c: Char, a: nullable A)   
+       fun bar=(c: Char, a: nullable A)   

        do
                _num = c
                _attribute = a
        end
 
        do
                _num = c
                _attribute = a
        end
 

-       meth bar(c: Char): nullable A
+       fun bar(c: Char): nullable A

        do
                if c == _num then
                        return _attribute
        do
                if c == _num then
                        return _attribute

@@ -43,7 +43,7 @@ class A
                end
        end
 
                end
        end
 

-       redef meth to_s: String
+       redef fun to_s: String

        do
                var s = _num.to_s
                if _attribute == null then
        do
                var s = _num.to_s
                if _attribute == null then

diff --git a/tests/test_extern.nit b/tests/test_extern.nit
index f3fd6f0..e9c0f4c 100644 (file)
--- a/tests/test_extern.nit
+++ b/tests/test_extern.nit
@@ -14,9 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth foo: Int is extern "foo"
-meth bar(i: Int): Int is extern "bar"
-meth baz(a: Object): Object is extern "baz"
+fun foo: Int is extern "foo"
+fun bar(i: Int): Int is extern "bar"
+fun baz(a: Object): Object is extern "baz"

 
 print(foo)
 print(bar(1))
 
 print(foo)
 print(bar(1))

diff --git a/tests/test_gen.nit b/tests/test_gen.nit
index ed4697a..93718dc 100644 (file)
--- a/tests/test_gen.nit
+++ b/tests/test_gen.nit
@@ -16,12 +16,12 @@
 
 
 class Toto[E]
 
 
 class Toto[E]

-   attr _item: E
-   meth set(e: E)
+   var _item: E
+   fun set(e: E)

       do _item = e end
       do _item = e end

-   meth get: E
+   fun get: E

       do return _item end
       do return _item end

-   redef meth to_s: String
+   redef fun to_s: String

       do return _item.to_s end
 
    init do end
       do return _item.to_s end
 
    init do end

@@ -49,14 +49,14 @@ end
 
 
 
 
 
 

-meth test_toto
+fun test_toto

 do
        var t = new Toto[Int]
        t.set(5)
        print(t)
 end
 
 do
        var t = new Toto[Int]
        t.set(5)
        print(t)
 end
 

-meth test_array
+fun test_array

 do
        var a = new Array[Int].with_capacity(3)
        a.add(1)
 do
        var a = new Array[Int].with_capacity(3)
        a.add(1)

diff --git a/tests/test_gen_inh.nit b/tests/test_gen_inh.nit
index e03fbad..c8545bb 100644 (file)
--- a/tests/test_gen_inh.nit
+++ b/tests/test_gen_inh.nit
@@ -18,10 +18,10 @@ import kernel
 
 class Gen1[E, F]
 special Object
 
 class Gen1[E, F]
 special Object

-   readable writable attr _e: E
-   attr _f_: F
-   meth f: F do return _f_ end 
-   meth f=(x: F) do _f_ = x end
+   readable writable var _e: E
+   var _f_: F
+   fun f: F do return _f_ end 
+   fun f=(x: F) do _f_ = x end

 
    init(e:E) do _e = e
 end
 
    init(e:E) do _e = e
 end

@@ -33,10 +33,10 @@ end
 
 class Gen3[H: Int]
 special Gen1[H, Char]
 
 class Gen3[H: Int]
 special Gen1[H, Char]

-   redef readable redef writable redef attr _e: H
-   redef attr _f_: Char = 'N'
-   redef meth f: Char do return _f_ end 
-   redef meth f=(x: Char) do _f_ = x end
+   redef readable redef writable redef var _e: H
+   redef var _f_: Char = 'N'
+   redef fun f: Char do return _f_ end 
+   redef fun f=(x: Char) do _f_ = x end

 
    init(e:H) do super(e)
 end
 
    init(e:H) do super(e)
 end

diff --git a/tests/test_inheritance.nit b/tests/test_inheritance.nit
index d08173f..11deb8f 100644 (file)
--- a/tests/test_inheritance.nit
+++ b/tests/test_inheritance.nit
@@ -15,26 +15,26 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-       meth f do print(1) end
-       meth g do print(1) end
-       meth h do print(1) end
-       meth i do print(1) end
+       fun f do print(1) end
+       fun g do print(1) end
+       fun h do print(1) end
+       fun i do print(1) end

 
        init do end
 end
 
 class B
 special A
 
        init do end
 end
 
 class B
 special A

-       redef meth g do print(2) end
-       redef meth i do print(2) end
+       redef fun g do print(2) end
+       redef fun i do print(2) end

 
        init do end
 end
 
 class C
 special A
 
        init do end
 end
 
 class C
 special A

-       redef meth h do print(3) end
-       redef meth i do print(3) end
+       redef fun h do print(3) end
+       redef fun i do print(3) end

 
        init do end
 end
 
        init do end
 end

@@ -42,7 +42,7 @@ end
 class D
 special B
 special C
 class D
 special B
 special C

-       redef meth i do print(4) end
+       redef fun i do print(4) end

 
        init do end
 end
 
        init do end
 end

diff --git a/tests/test_inheritance_raf.nit b/tests/test_inheritance_raf.nit
index f12543f..dcc8e73 100644 (file)
--- a/tests/test_inheritance_raf.nit
+++ b/tests/test_inheritance_raf.nit
@@ -17,12 +17,12 @@
 import test_inheritance
 
 redef class A
 import test_inheritance
 
 redef class A

-       redef meth h do print(5) end
-       redef meth i do print(5) end
+       redef fun h do print(5) end
+       redef fun i do print(5) end

 end
 
 redef class C
 end
 
 redef class C

-       redef meth i do print(7) end
+       redef fun i do print(7) end

 end
 
 var a = new A
 end
 
 var a = new A

diff --git a/tests/test_kernel.nit b/tests/test_kernel.nit
index 2d48bd9..176feda 100644 (file)
--- a/tests/test_kernel.nit
+++ b/tests/test_kernel.nit
@@ -17,12 +17,12 @@
 import kernel
 
 class Foo
 import kernel
 
 class Foo

-       redef meth output
+       redef fun output

        do
                10.output
        end
 
        do
                10.output
        end
 

-       redef meth ==(o: nullable Object): Bool
+       redef fun ==(o: nullable Object): Bool

        do
                return true
        end
        do
                return true
        end

diff --git a/tests/test_map.nit b/tests/test_map.nit
index ffa3755..01b5ee6 100644 (file)
--- a/tests/test_map.nit
+++ b/tests/test_map.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
 # limitations under the License.
 
 

-meth test1(h: Map[Int, Int])
+fun test1(h: Map[Int, Int])

 do
        print("* test 1 *")
        h[1] = 2
 do
        print("* test 1 *")
        h[1] = 2

@@ -37,7 +37,7 @@ do
        print(s)
 end
 
        print(s)
 end
 

-meth test2(h: Map[Int, Int])
+fun test2(h: Map[Int, Int])

 do
        print("* test 2 *")
        var nb = 999
 do
        print("* test 2 *")
        var nb = 999

@@ -83,7 +83,7 @@ do
 end
 
 
 end
 
 

-meth test3(m: Map[String, String])
+fun test3(m: Map[String, String])

 do
        print("* test 3 *")
        print("* start:")
 do
        print("* test 3 *")
        print("* start:")

diff --git a/tests/test_map_closure_default.nit b/tests/test_map_closure_default.nit
index d6a57d6..e374d5e 100644 (file)
--- a/tests/test_map_closure_default.nit
+++ b/tests/test_map_closure_default.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 redef class Map[K, V]
 # limitations under the License.
 
 redef class Map[K, V]

-       meth get(k: K): V
+       fun get(k: K): V

                with default: V do abort
        do
                if has_key(k) then return self[k]
                with default: V do abort
        do
                if has_key(k) then return self[k]

diff --git a/tests/test_mem.nit b/tests/test_mem.nit
index f1e95f8..9487e82 100644 (file)
--- a/tests/test_mem.nit
+++ b/tests/test_mem.nit
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth foo(n: Int): List[Int]
+fun foo(n: Int): List[Int]

     do
        var a: List[Int]
        if n > 0 then
     do
        var a: List[Int]
        if n > 0 then

diff --git a/tests/test_meta.nit b/tests/test_meta.nit
index dd31e5c..198f228 100644 (file)
--- a/tests/test_meta.nit
+++ b/tests/test_meta.nit
@@ -16,19 +16,19 @@
 
 
 class A
 
 
 class A

-   meth foo
+   fun foo

       do
           printn("A")
       end
       do
           printn("A")
       end

-   meth blup(a: Int)
+   fun blup(a: Int)

       do
          blup2(a, 1)
       end
       do
          blup2(a, 1)
       end

-   meth blup2(a: Int, b : Int)
+   fun blup2(a: Int, b : Int)

       do
          printn(a+b)
       end
       do
          printn(a+b)
       end

-   meth blop(a: Int, b: Int...)
+   fun blop(a: Int, b: Int...)

       do
          var i = b.iterator
          while i.is_ok do
       do
          var i = b.iterator
          while i.is_ok do

@@ -40,7 +40,7 @@ end
 
 class B
 special A
 
 class B
 special A

-   redef meth foo
+   redef fun foo

       do
           printn("B")
       end
       do
           printn("B")
       end

@@ -48,7 +48,7 @@ end
 
 class C
 special A
 
 class C
 special A

-   meth foo2
+   fun foo2

       do
           printn("C")
       end
       do
           printn("C")
       end

@@ -57,7 +57,7 @@ end
 class D
 special B
 special C
 class D
 special B
 special C

-   redef meth foo
+   redef fun foo

       do
           printn("D")
       end
       do
           printn("D")
       end

@@ -65,7 +65,7 @@ special C
    init do end
 end
 
    init do end
 end
 

-meth test1
+fun test1

 do
        var b: B
        b = new D
 do
        var b: B
        b = new D

@@ -74,7 +74,7 @@ do
        b.blup(3)
 end
 
        b.blup(3)
 end
 

-meth test2
+fun test2

 do
        var b = new D
        var a = [1,2,3]
 do
        var b = new D
        var a = [1,2,3]

diff --git a/tests/test_multiconstraint.nit b/tests/test_multiconstraint.nit
index bad27ae..cebc6d7 100644 (file)
--- a/tests/test_multiconstraint.nit
+++ b/tests/test_multiconstraint.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-   meth foo
+   fun foo

    do
       11.output
    end
    do
       11.output
    end

@@ -27,11 +27,11 @@ end
 
 class B
 special A
 
 class B
 special A

-   redef  meth foo
+   redef  fun foo

    do
       21.output
    end
    do
       21.output
    end

-   meth bar
+   fun bar

    do
       22.output
    end
    do
       22.output
    end

@@ -41,11 +41,11 @@ end
 
 class C
 special B
 
 class C
 special B

-   redef meth foo
+   redef fun foo

    do
       31.output
    end
    do
       31.output
    end

-   redef meth bar
+   redef fun bar

    do
       32.output
    end
    do
       32.output
    end

@@ -54,7 +54,7 @@ special B
 end
 
 class G[E]
 end
 
 class G[E]

-   meth out0
+   fun out0

    do
       0.output
    end
    do
       0.output
    end

@@ -62,13 +62,13 @@ class G[E]
    init do end
 end
 class G[E: A]
    init do end
 end
 class G[E: A]

-   meth out1(e: E)
+   fun out1(e: E)

    do
       e.foo
    end
 end
 class G[E: B]
    do
       e.foo
    end
 end
 class G[E: B]

-   meth out2(e: E)
+   fun out2(e: E)

    do
       e.foo
       e.bar
    do
       e.foo
       e.bar

diff --git a/tests/test_multiconstraint_inh.nit b/tests/test_multiconstraint_inh.nit
index d924a05..99190b1 100644 (file)
--- a/tests/test_multiconstraint_inh.nit
+++ b/tests/test_multiconstraint_inh.nit
@@ -20,23 +20,23 @@ class A
 end
 
 class I[F]
 end
 
 class I[F]

-   meth foo do 1.output end
+   fun foo do 1.output end

 end
 
 class J
 special I[A]
 end
 
 class J
 special I[A]

-   meth bar do 2.output end
+   fun bar do 2.output end

 
        init do end
 end
 
 class G[E]
 
        init do end
 end
 
 class G[E]

-   meth baz(e: I[E]) do e.foo end
+   fun baz(e: I[E]) do e.foo end

 end
 
 class H[F]
 special G[A]
 end
 
 class H[F]
 special G[A]

-   redef meth baz(e: J) do e.bar end
+   redef fun baz(e: J) do e.bar end

 
    init do end
 end
 
    init do end
 end

diff --git a/tests/test_obj.nit b/tests/test_obj.nit
index 757e2fd..0520f7b 100644 (file)
--- a/tests/test_obj.nit
+++ b/tests/test_obj.nit
@@ -16,12 +16,12 @@
 
 
 class O
 
 
 class O

-   meth foo
+   fun foo

    do
       printn(10)
    end
    
    do
       printn(10)
    end
    

-   meth bar
+   fun bar

    do
       printn(20)
    end
    do
       printn(20)
    end

@@ -31,12 +31,12 @@ end
 
 class A
 special O
 
 class A
 special O

-   redef meth foo
+   redef fun foo

    do
       printn(11)
    end
    
    do
       printn(11)
    end
    

-   redef meth bar
+   redef fun bar

    do
       printn(21)
    end
    do
       printn(21)
    end

@@ -46,12 +46,12 @@ end
 
 class B
 special A
 
 class B
 special A

-   redef meth foo
+   redef fun foo

    do
       printn(12)
    end
    
    do
       printn(12)
    end
    

-   meth baz
+   fun baz

    do
       printn(32)
    end
    do
       printn(32)
    end

diff --git a/tests/test_operator_brackets.nit b/tests/test_operator_brackets.nit
index 4b1a479..2f680d4 100644 (file)
--- a/tests/test_operator_brackets.nit
+++ b/tests/test_operator_brackets.nit
@@ -19,13 +19,13 @@
 class Matrice
        # A matrice of integers
 
 class Matrice
        # A matrice of integers
 

-       meth [](x: Int, y: Int): Int
+       fun [](x: Int, y: Int): Int

        # The integer at (x,y)
        do
                return _tab[x][y]
        end
 
        # The integer at (x,y)
        do
                return _tab[x][y]
        end
 

-       meth []=(x: Int, y: Int, v: Int)
+       fun []=(x: Int, y: Int, v: Int)

        # Put v in (x, y)
        do
                # Buld more arrays if needed
        # Put v in (x, y)
        do
                # Buld more arrays if needed

@@ -49,7 +49,7 @@ class Matrice
        end
 
 private
        end
 
 private

-       attr _tab: Array[Array[Int]] # An array of array to store items
+       var _tab: Array[Array[Int]] # An array of array to store items

 
 
        init
 
 
        init

diff --git a/tests/test_operators.nit b/tests/test_operators.nit
index 2a2a403..1ad8a84 100644 (file)
--- a/tests/test_operators.nit
+++ b/tests/test_operators.nit
@@ -16,62 +16,62 @@
 
 
 class A
 
 
 class A

-   meth +(a: A): A
+   fun +(a: A): A

    do
           2.output
           return self
    end
    do
           2.output
           return self
    end

-   meth -: A
+   fun -: A

    do
           1.output
           return self
    end
    do
           1.output
           return self
    end

-   meth -(a: A): A
+   fun -(a: A): A

    do
           6.output
           return self
    end
    do
           6.output
           return self
    end

-   meth *(a: A): A
+   fun *(a: A): A

    do
           3.output
           return self
    end
    do
           3.output
           return self
    end

-   meth /(a: A): A
+   fun /(a: A): A

    do
           4.output
           return self
    end
    do
           4.output
           return self
    end

-   meth %(a: A): A
+   fun %(a: A): A

    do
           5.output
           return self
    end
    do
           5.output
           return self
    end

-   redef meth ==(a: nullable Object): Bool
+   redef fun ==(a: nullable Object): Bool

    do
           7.output
           return true
    end
    do
           7.output
           return true
    end

-   meth <(a: A): Bool
+   fun <(a: A): Bool

    do
           9.output
           return true
    end
    do
           9.output
           return true
    end

-   meth >(a: A): Bool
+   fun >(a: A): Bool

    do
           10.output
           return true
    end
    do
           10.output
           return true
    end

-   meth <=(a: A): Bool
+   fun <=(a: A): Bool

    do
           11.output
           return true
    end
    do
           11.output
           return true
    end

-   meth >=(a: A): Bool
+   fun >=(a: A): Bool

    do
           12.output
           return true
    end
    do
           12.output
           return true
    end

-   meth <=>(a: A): Int
+   fun <=>(a: A): Int

    do
           13.output
           return 0
    do
           13.output
           return 0

diff --git a/tests/test_paire.nit b/tests/test_paire.nit
index 391b7a6..f567201 100644 (file)
--- a/tests/test_paire.nit
+++ b/tests/test_paire.nit
@@ -15,26 +15,26 @@
 # limitations under the License.
 
 class Pair[F, S]
 # limitations under the License.
 
 class Pair[F, S]

-       meth first: F
+       fun first: F

                do
                        return _first
                end
                do
                        return _first
                end

-       meth second: S
+       fun second: S

                do
                        return _second
                end
                do
                        return _second
                end

-       meth set(f: F, s: S)
+       fun set(f: F, s: S)

                do
                        _first = f
                        _second =  s
                end
                do
                        _first = f
                        _second =  s
                end

-       redef meth to_s: String
+       redef fun to_s: String

                do
                        return "{first}:{_second}"
                end
 private
                do
                        return "{first}:{_second}"
                end
 private

-       attr _first: F
-       attr _second: S
+       var _first: F
+       var _second: S

 
        init(f: F, s: S)
                do
 
        init(f: F, s: S)
                do

@@ -44,7 +44,7 @@ end
 
 class Pair[E: Comparable, E: Comparable]
 
 
 class Pair[E: Comparable, E: Comparable]
 

-       meth >(p: Pair[Comparable, Comparable]): Bool
+       fun >(p: Pair[Comparable, Comparable]): Bool

                do
                        return _first > p.first or 
                                first == p.first and second > p._second
                do
                        return _first > p.first or 
                                first == p.first and second > p._second

@@ -53,7 +53,7 @@ end
 
 class Pair[E: Int, E: Int]
 
 
 class Pair[E: Int, E: Int]
 

-       meth sum: Int
+       fun sum: Int

                do
                        return first + _second
                end
                do
                        return first + _second
                end

diff --git a/tests/test_refinement.nit b/tests/test_refinement.nit
index 5eea7e6..17b154c 100644 (file)
--- a/tests/test_refinement.nit
+++ b/tests/test_refinement.nit
@@ -16,11 +16,11 @@
 
 
 redef class Int
 
 
 redef class Int

-    meth fact0: Int
+    fun fact0: Int

        do
            return fact(1)
        end
        do
            return fact(1)
        end

-    meth fact(r: Int): Int
+    fun fact(r: Int): Int

        do
            if self <= 1 then
                return r
        do
            if self <= 1 then
                return r

@@ -30,7 +30,7 @@ redef class Int
            return 1
        end
 
            return 1
        end
 

-    meth fact2: Int
+    fun fact2: Int

        do
            var r = 1
            var i = self
        do
            var r = 1
            var i = self

@@ -43,7 +43,7 @@ redef class Int
 end
 
 redef class Array[F]
 end
 
 redef class Array[F]

-    redef meth add(item: F)
+    redef fun add(item: F)

        do
            self[length] = item
            self[length] = item
        do
            self[length] = item
            self[length] = item

@@ -51,7 +51,7 @@ redef class Array[F]
 end
 
 redef class Object
 end
 
 redef class Object

-    redef meth printn(a: Object...)
+    redef fun printn(a: Object...)

        do
             stdout.write("print:")
            stdout.write(a.to_s)
        do
             stdout.write("print:")
            stdout.write(a.to_s)

diff --git a/tests/test_return.nit b/tests/test_return.nit
index 4b54032..7df5ff7 100644 (file)
--- a/tests/test_return.nit
+++ b/tests/test_return.nit
@@ -14,24 +14,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth a
+fun a

 do
        return
 end
 
 do
        return
 end
 

-meth b: Int
+fun b: Int

 do
        return 1
 end
 
 do
        return 1
 end
 

-meth c: Int
+fun c: Int

 do
        do
                return 1
        end
 end
 
 do
        do
                return 1
        end
 end
 

-meth d: Int
+fun d: Int

 do
        if true then
        else
 do
        if true then
        else

@@ -40,7 +40,7 @@ do
        return 1
 end
 
        return 1
 end
 

-meth e: Int
+fun e: Int

 do
        while true do
                return 1
 do
        while true do
                return 1

@@ -48,7 +48,7 @@ do
        return 0
 end
 
        return 0
 end
 

-meth f: Int
+fun f: Int

 do
        if true then
                return 1
 do
        if true then
                return 1

diff --git a/tests/test_star.nit b/tests/test_star.nit
index 8a0ec23..c6dfc74 100644 (file)
--- a/tests/test_star.nit
+++ b/tests/test_star.nit
@@ -14,22 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

-meth foo(a: Int...)
+fun foo(a: Int...)

     do
        print(a)
     end
 
     do
        print(a)
     end
 

-meth bar(b: Int, a: Int...)
+fun bar(b: Int, a: Int...)

     do
        print("{b}, {a}")
     end
 
     do
        print("{b}, {a}")
     end
 

-meth baz(a: Int..., b: Int)
+fun baz(a: Int..., b: Int)

     do
        print("{a}, {b}")
     end
 
     do
        print("{a}, {b}")
     end
 

-meth foobar(b: Int, a: Int..., c: Int)
+fun foobar(b: Int, a: Int..., c: Int)

     do
        print("{c}, {a}, {b}")
     end
     do
        print("{c}, {a}, {b}")
     end

diff --git a/tests/test_string_search.nit b/tests/test_string_search.nit
index f78ad4b..26aaf9d 100644 (file)
--- a/tests/test_string_search.nit
+++ b/tests/test_string_search.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
 # limitations under the License.
 
 

-meth search_and_split(s: String, p: Pattern)
+fun search_and_split(s: String, p: Pattern)

     do
        print("string: \"{s}\" ; pattern: \"{p}\"")
        print("searches:")
     do
        print("string: \"{s}\" ; pattern: \"{p}\"")
        print("searches:")

diff --git a/tests/test_super.nit b/tests/test_super.nit
index ea2d8ee..2f8d427 100644 (file)
--- a/tests/test_super.nit
+++ b/tests/test_super.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

        do
                0.output
        end
        do
                0.output
        end

@@ -25,7 +25,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth foo
+       redef fun foo

        do
                1.output
                super
        do
                1.output
                super

diff --git a/tests/test_super_explicit.nit b/tests/test_super_explicit.nit
index b931c40..95c2632 100644 (file)
--- a/tests/test_super_explicit.nit
+++ b/tests/test_super_explicit.nit
@@ -17,14 +17,14 @@
 import test_super
 
 redef class A
 import test_super
 
 redef class A

-       redef meth foo
+       redef fun foo

        do
                10.output
        end
 end
 
 redef class B
        do
                10.output
        end
 end
 
 redef class B

-       redef meth foo
+       redef fun foo

        do
                11.output
                test_super::super
        do
                11.output
                test_super::super

diff --git a/tests/test_super_gen.nit b/tests/test_super_gen.nit
index b1f12c4..7d7aef5 100644 (file)
--- a/tests/test_super_gen.nit
+++ b/tests/test_super_gen.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A[E: Object, F: Object]
 import kernel
 
 class A[E: Object, F: Object]

-       meth foo(e: E, f: F): F
+       fun foo(e: E, f: F): F

        do
                0.output
                return f
        do
                0.output
                return f

@@ -26,7 +26,7 @@ end
 
 class B[G: Int]
 special A[Bool,G]
 
 class B[G: Int]
 special A[Bool,G]

-       redef meth foo(b: Bool, g: G): G
+       redef fun foo(b: Bool, g: G): G

        do
                1.output
                super
        do
                1.output
                super

diff --git a/tests/test_super_gen_raf.nit b/tests/test_super_gen_raf.nit
index e370e96..60b72e1 100644 (file)
--- a/tests/test_super_gen_raf.nit
+++ b/tests/test_super_gen_raf.nit
@@ -18,7 +18,7 @@ import test_super_gen
 
 class C[H: Int]
 special A[H, Int]
 
 class C[H: Int]
 special A[H, Int]

-       redef meth foo(a: H, b: Int): H
+       redef fun foo(a: H, b: Int): H

        do
                return super
        end
        do
                return super
        end

diff --git a/tests/test_super_param.nit b/tests/test_super_param.nit
index 293bbb2..b82998e 100644 (file)
--- a/tests/test_super_param.nit
+++ b/tests/test_super_param.nit
@@ -17,7 +17,7 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo(i: Int): Int
+       fun foo(i: Int): Int

        do
                return i + 10
        end
        do
                return i + 10
        end

@@ -25,7 +25,7 @@ end
 
 class B
 special A
 
 class B
 special A

-       redef meth foo(i: Int): Int
+       redef fun foo(i: Int): Int

        do
                return super + 5
        end
        do
                return super + 5
        end

diff --git a/tests/test_super_param_raf.nit b/tests/test_super_param_raf.nit
index 9fc72c4..2c1f436 100644 (file)
--- a/tests/test_super_param_raf.nit
+++ b/tests/test_super_param_raf.nit
@@ -17,7 +17,7 @@
 import test_super_param
 
 redef class B
 import test_super_param
 
 redef class B

-       redef meth foo(a: Int): Int
+       redef fun foo(a: Int): Int

        do
                return super * 2
        end
        do
                return super * 2
        end

diff --git a/tests/test_super_param_raf2.nit b/tests/test_super_param_raf2.nit
index 8b9c3de..1723467 100644 (file)
--- a/tests/test_super_param_raf2.nit
+++ b/tests/test_super_param_raf2.nit
@@ -18,7 +18,7 @@ import test_super_param_raf
 
 class C
 special B
 
 class C
 special B

-       redef meth foo(a: Int): Int
+       redef fun foo(a: Int): Int

        do
                return super * 2
        end
        do
                return super * 2
        end

diff --git a/tests/test_undead.nit b/tests/test_undead.nit
index 8b51728..be6ee44 100644 (file)
--- a/tests/test_undead.nit
+++ b/tests/test_undead.nit
@@ -17,11 +17,11 @@
 import kernel
 
 class A
 import kernel
 
 class A

-       meth foo
+       fun foo

        do
                1.output
        end
        do
                1.output
        end

-       meth bar: Int
+       fun bar: Int

        do
                return 2
        end
        do
                return 2
        end

diff --git a/tests/test_variance_attr.nit b/tests/test_variance_attr.nit
index 2f6101d..7ae65d3 100644 (file)
--- a/tests/test_variance_attr.nit
+++ b/tests/test_variance_attr.nit
@@ -15,19 +15,19 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-    attr _foo: nullable Object
-    attr _bar: nullable A
-    attr _baz: nullable Int
-    redef meth output do 'A'.output end
+    var _foo: nullable Object
+    var _bar: nullable A
+    var _baz: nullable Int
+    redef fun output do 'A'.output end

 
     init do end
 end
 
 class B
 special A
 
     init do end
 end
 
 class B
 special A

-    redef attr _foo: nullable Int
-    redef attr _bar: nullable B
-    redef meth output do 'B'.output end
+    redef var _foo: nullable Int
+    redef var _bar: nullable B
+    redef fun output do 'B'.output end

 
     init do end
 end
 
     init do end
 end

diff --git a/tests/test_variance_param.nit b/tests/test_variance_param.nit
index 79ef0f3..679fa68 100644 (file)
--- a/tests/test_variance_param.nit
+++ b/tests/test_variance_param.nit
@@ -17,10 +17,10 @@
 class A
        type T: A
        type U: B
 class A
        type T: A
        type U: B

-       meth foo(a: T) do a.output
-       meth bar(b: U) do b.output
-       meth baz(i: Int) do i.output
-       redef meth output do 'A'.output
+       fun foo(a: T) do a.output
+       fun bar(b: U) do b.output
+       fun baz(i: Int) do i.output
+       redef fun output do 'A'.output

 
        init do end
 end
 
        init do end
 end

@@ -29,10 +29,10 @@ class B
 special A
        redef type T: B
        redef type U: Int
 special A
        redef type T: B
        redef type U: Int

-       redef meth foo(a: T) do a.output
-       redef meth bar(b: U) do b.output
-       redef meth baz(i: Int) do i.output
-       redef meth output do 'B'.output
+       redef fun foo(a: T) do a.output
+       redef fun bar(b: U) do b.output
+       redef fun baz(i: Int) do i.output
+       redef fun output do 'B'.output

 
        init do end
 end
 
        init do end
 end

@@ -40,9 +40,9 @@ end
 redef class Int
 special B
        redef type T: Int
 redef class Int
 special B
        redef type T: Int

-       redef meth foo(a: T) do a.output
-       redef meth bar(b: U) do b.output
-       redef meth output is intern
+       redef fun foo(a: T) do a.output
+       redef fun bar(b: U) do b.output
+       redef fun output is intern

 end
 
 var a = new A
 end
 
 var a = new A

diff --git a/tests/test_variance_ret.nit b/tests/test_variance_ret.nit
index 44e1043..02093a2 100644 (file)
--- a/tests/test_variance_ret.nit
+++ b/tests/test_variance_ret.nit
@@ -15,22 +15,22 @@
 # limitations under the License.
 
 class A
 # limitations under the License.
 
 class A

-    meth foo: A
+    fun foo: A

     do 
            return new A
     end
     
     do 
            return new A
     end
     

-    meth bar: B 
+    fun bar: B 

     do 
            return new B 
     end
     
     do 
            return new B 
     end
     

-    meth baz: Int 
+    fun baz: Int 

     do 
            return 5 
     end
     
     do 
            return 5 
     end
     

-    redef meth output 
+    redef fun output 

     do 
            'A'.output 
     end
     do 
            'A'.output 
     end

@@ -40,19 +40,19 @@ end
 
 class B
 special A
 
 class B
 special A

-    redef meth foo: B 
+    redef fun foo: B 

     do 
            return new B 
     end
     do 
            return new B 
     end

-    redef meth bar: Int 
+    redef fun bar: Int 

     do 
            return 6 
     end
     do 
            return 6 
     end

-    redef meth baz: Int 
+    redef fun baz: Int 

     do 
            return 7 
     end
     do 
            return 7 
     end

-    redef meth output 
+    redef fun output 

     do 
            'B'.output 
     end
     do 
            'B'.output 
     end

@@ -62,15 +62,15 @@ end
 
 redef class Int
 special B
 
 redef class Int
 special B

-    redef meth foo: Int 
+    redef fun foo: Int 

     do 
            return 8 
     end
     do 
            return 8 
     end

-    redef meth bar: Int 
+    redef fun bar: Int 

     do
            return 9
     end
     do
            return 9
     end

-    redef meth output is intern
+    redef fun output is intern

 end
 
 var a = new A
 end
 
 var a = new A