nitx&ni_nitdoc: adapt to the phased modelbuild

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

diff --git a/src/ni_nitdoc.nit b/src/ni_nitdoc.nit
index bb81f1a..bdb915e 100644 (file)
--- a/src/ni_nitdoc.nit
+++ b/src/ni_nitdoc.nit
@@ -17,6 +17,7 @@
 module ni_nitdoc
 
 import model_utils
+import modelize_property
 
 # The NitdocContext contains all the knowledge used for doc generation
 class NitdocContext
@@ -66,8 +67,9 @@ class NitdocContext
                model = new Model
                mbuilder = new ModelBuilder(model, toolcontext)
                # Here we load an process all modules passed on the command line
-               var mmodules = mbuilder.parse_and_build(arguments)
+               var mmodules = mbuilder.parse(arguments)
                if mmodules.is_empty then return
+               mbuilder.run_phases
 
                if mmodules.length == 1 then
                        mainmodule = mmodules.first

diff --git a/src/nitx.nit b/src/nitx.nit
index 11db74a..6eb657b 100644 (file)
--- a/src/nitx.nit
+++ b/src/nitx.nit
@@ -16,6 +16,7 @@
 module nitx
 
 import model_utils
+import modelize_property
 
 private class Pager
        var content = new Buffer
@@ -53,8 +54,9 @@ class NitIndex
                # Here we load an process std modules
                #var dir = "NIT_DIR".environ
                #var mmodules = modelbuilder.parse_and_build(["{dir}/lib/standard/standard.nit"])
-               var mmodules = mbuilder.parse_and_build([arguments.first])
+               var mmodules = mbuilder.parse([arguments.first])
                if mmodules.is_empty then return
+               mbuilder.run_phases
                assert mmodules.length == 1
                self.mainmodule = mmodules.first
        end