Merge remote-tracking branch 'alexandre/master'

diff --cc src/separate_erasure_compiler.nit
Simple merge

diff --cc tests/sav/nitg.res
index eabdb81,d622880..46ee836
--- 1/tests/sav/nitg.res
--- 2/tests/sav/nitg.res
+++ b/tests/sav/nitg.res
@@@ -21,6 -21,7 +21,8 @@@
    --separate                  Use separate compilation
    --no-inline-intern          Do not inline call to intern methods
    --inline-coloring-numbers   Inline colors and ids
-   --use-naive-coloring        Colorize items incrementaly, used to simulate binary matrix typing
+   --bm-typing                 Colorize items incrementaly, used to simulate binary matrix typing
+   --phmod-typing              Replace coloration by perfect hashing (with mod operator)
+   --phand-typing              Replace coloration by perfect hashing (with and operator)
    --erasure                   Erase generic types
 +  --no-check-erasure-cast     Disable implicit casts on unsafe return with erasure-typing policy (dangerous)