migration: update pep8analyis to latest Nit spec

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/pep8analysis/src/ast/rich_instructions.nit b/contrib/pep8analysis/src/ast/rich_instructions.nit
index 20ddc07..6989980 100644 (file)
--- a/contrib/pep8analysis/src/ast/rich_instructions.nit
+++ b/contrib/pep8analysis/src/ast/rich_instructions.nit
@@ -143,8 +143,9 @@ abstract class ARichBinaryInstruction
        init from( src: ABinaryInstruction ) do
                _n_operand = src.n_operand
                _n_id = src.n_id
-               location = src.location
                parent = src.parent
+
+               init(src.location)
        end
 end
 
@@ -153,8 +154,9 @@ abstract class ARichUnaryInstruction
 
        init from( src: AUnaryInstruction ) do
                _n_id = src.n_id
-               _location = src.location
                parent = src.parent
+
+               init(src.location)
        end
 end
 

diff --git a/contrib/pep8analysis/src/cfg/cfg_base.nit b/contrib/pep8analysis/src/cfg/cfg_base.nit
index c532215..6e22cf2 100644 (file)
--- a/contrib/pep8analysis/src/cfg/cfg_base.nit
+++ b/contrib/pep8analysis/src/cfg/cfg_base.nit
@@ -85,8 +85,8 @@ class CFG
                end
 
                # sort breakpoints in order
-               starts = starts.uniq.sort_filter.to_a
-               ends = ends.uniq.sort_filter.to_a
+               starts = starts.iterator.uniq.sort.to_a
+               ends = ends.iterator.uniq.sort.to_a
 
                # create basic blocks
                var current_block: nullable BasicBlock = null

diff --git a/contrib/pep8analysis/src/cfg/sanity.nit b/contrib/pep8analysis/src/cfg/sanity.nit
index 78242c2..9188ba0 100644 (file)
--- a/contrib/pep8analysis/src/cfg/sanity.nit
+++ b/contrib/pep8analysis/src/cfg/sanity.nit
@@ -53,7 +53,7 @@ redef class AnalysisManager
 
        private fun group(lines: Array[ALine], msg: String, error: Bool)
        do
-               lines = lines.sort_filter.to_a
+               lines = lines.iterator.sort.to_a
                var len = lines.length
                var first: nullable ALine = null
                for i in [0..len[ do

diff --git a/contrib/pep8analysis/src/flow_analysis/types.nit b/contrib/pep8analysis/src/flow_analysis/types.nit
index 77ddd4f..96fd1ca 100644 (file)
--- a/contrib/pep8analysis/src/flow_analysis/types.nit
+++ b/contrib/pep8analysis/src/flow_analysis/types.nit
@@ -214,7 +214,7 @@ class TypesMap
                var block_begin: nullable Int = null
                var block_end = 0
                var block_type = ' '
-               for a in mem.keys.to_a.sort_filter do
+               for a in mem.keys.iterator.sort do
                        var t = mem[a]
                        if block_begin != null and (block_type != t or block_end != a-1) then
                                var lbl = label_at(block_begin)

diff --git a/contrib/pep8analysis/src/location.nit b/contrib/pep8analysis/src/location.nit
index b3e8458..def0b2e 100644 (file)
--- a/contrib/pep8analysis/src/location.nit
+++ b/contrib/pep8analysis/src/location.nit
@@ -193,7 +193,7 @@ class Location
                        lmid = ""
                        lend = ""
                end
-               var indent = new Buffer
+               var indent = new FlatBuffer
                for j in [line_start..line_start+l.column_start-1[ do
                        if string[j] == '\t' then
                                indent.add '\t'