contrib: use add_all instead of recover_with

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

diff --git a/contrib/jwrapper/src/model.nit b/contrib/jwrapper/src/model.nit
index e642da4..bfbbdf0 100644 (file)
--- a/contrib/jwrapper/src/model.nit
+++ b/contrib/jwrapper/src/model.nit
@@ -261,7 +261,7 @@ class JavaModel
        # All classes, from this pass and from other passes
        var all_classes: HashMap[String, JavaClass] is noserialize, lazy do
                var classes = new HashMap[String, JavaClass]
-               classes.recover_with self.classes
+               classes.add_all self.classes
 
                for model_path in sys.opt_load_models.value do
                        if not model_path.file_exists then
@@ -284,7 +284,7 @@ class JavaModel
                                continue
                        end
 
-                       classes.recover_with model.classes
+                       classes.add_all model.classes
                end
 
                return classes

diff --git a/contrib/nitiwiki/src/wiki_links.nit b/contrib/nitiwiki/src/wiki_links.nit
index c1785b2..ac3e171 100644 (file)
--- a/contrib/nitiwiki/src/wiki_links.nit
+++ b/contrib/nitiwiki/src/wiki_links.nit
@@ -211,7 +211,7 @@ redef class WikiArticle
                super
                if not is_dirty and not wiki.force_render or not has_source then return
                content = md_proc.process(md.as(not null))
-               headlines.recover_with(md_proc.emitter.decorator.headlines)
+               headlines.add_all(md_proc.emitter.decorator.headlines)
        end
 end
 

diff --git a/contrib/nitrpg/src/statistics.nit b/contrib/nitrpg/src/statistics.nit
index 2827ae9..cde6816 100644 (file)
--- a/contrib/nitrpg/src/statistics.nit
+++ b/contrib/nitrpg/src/statistics.nit
@@ -177,7 +177,7 @@ class GameStats
                obj["period"] = period
                obj["owner"] = owner.key
                var values = new JsonObject
-               values.recover_with(self)
+               values.add_all(self)
                obj["values"] = values
                return obj
        end

diff --git a/contrib/pep8analysis/src/flow_analysis/range_analysis.nit b/contrib/pep8analysis/src/flow_analysis/range_analysis.nit
index f372ad5..d64d7af 100644 (file)
--- a/contrib/pep8analysis/src/flow_analysis/range_analysis.nit
+++ b/contrib/pep8analysis/src/flow_analysis/range_analysis.nit
@@ -153,7 +153,7 @@ class RangeMap
        fun copy: RangeMap
        do
                var c = new RangeMap
-               c.recover_with(self)
+               c.add_all(self)
                return c
        end
 
@@ -171,7 +171,7 @@ redef class AInstruction
        redef fun accept_range_analysis(v, ins, outs)
        do
                visit_all(v)
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
        end
 end
 
@@ -180,7 +180,7 @@ redef class ALoadInstruction
        do
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
                var variable = def_var
                #var add = new RangeMap[Var, ValRange](variable,
 
@@ -205,7 +205,7 @@ redef class AStoreInstruction
        do
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
                var src = src_var # reg
                var def = def_var # mem
 
@@ -225,7 +225,7 @@ redef class AInputInstruction
        do
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var def = def_var # mem
 
@@ -244,7 +244,7 @@ redef class AArithmeticInstruction
                v.current_range = null
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var reg = reg_var
 
@@ -284,7 +284,7 @@ redef class ANegInstruction
                v.current_range = null
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var reg = reg_var
                if ins.has_key(reg) then
@@ -324,7 +324,7 @@ redef class AMovInstruction
                v.current_range = null
                visit_all(v)
 
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var reg = new RegisterVar('A')
                if outs.has_key(reg) then

diff --git a/contrib/pep8analysis/src/flow_analysis/reaching_defs.nit b/contrib/pep8analysis/src/flow_analysis/reaching_defs.nit
index 0df593b..0fe04ef 100644 (file)
--- a/contrib/pep8analysis/src/flow_analysis/reaching_defs.nit
+++ b/contrib/pep8analysis/src/flow_analysis/reaching_defs.nit
@@ -48,14 +48,14 @@ end
 redef class AInstruction
        redef fun accept_reaching_defs_analysis(v, ins, outs)
        do
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
        end
 end
 
 redef class ALoadInstruction
        redef fun accept_reaching_defs_analysis(v, ins, outs)
        do
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var variable = def_var
                if variable != null then
@@ -72,7 +72,7 @@ end
 redef class AStoreInstruction
        redef fun accept_reaching_defs_analysis(v, ins, outs)
        do
-               if ins != null then outs.recover_with(ins)
+               if ins != null then outs.add_all(ins)
 
                var variable = def_var
                if variable != null then