X-Git-Url: http://nitlanguage.org

diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index 38db14a..671fcd0 100644
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -25,7 +25,7 @@ private import more_collections
 
 redef class ToolContext
 	# Option --ignore-visibility
-	var opt_ignore_visibility = new OptionBool("Do not check, and produce errors, on visibility issues.", "--ignore-visibility")
+	var opt_ignore_visibility = new OptionBool("Do not check, and produce errors, on visibility issues", "--ignore-visibility")
 
 	redef init
 	do
@@ -45,6 +45,8 @@ redef class ToolContext
 			mainmodule = new MModule(modelbuilder.model, null, mmodules.first.name + "-m", new Location(mmodules.first.location.file, 0, 0, 0, 0))
 			mainmodule.is_fictive = true
 			mainmodule.set_imported_mmodules(mmodules)
+			modelbuilder.apply_conditional_importations(mainmodule)
+			modelbuilder.run_phases
 		end
 		return mainmodule
 	end
@@ -59,6 +61,9 @@ redef class ToolContext
 				phase.process_mainmodule(mainmodule, mmodules)
 			end
 		end
+
+		check_errors
+		errors_info
 	end
 end
 
@@ -84,17 +89,18 @@ redef class ModelBuilder
 	# Run phases on all loaded modules
 	fun run_phases
 	do
-		var mmodules = model.mmodules.to_a
+		var mmodules = parsed_modules.to_a
 		model.mmodule_importation_hierarchy.sort(mmodules)
 		var nmodules = new Array[AModule]
 		for mm in mmodules do
+			if mm.is_fictive then continue
 			nmodules.add(mmodule2node(mm).as(not null))
 		end
 		toolcontext.run_phases(nmodules)
 
 		if toolcontext.opt_only_metamodel.value then
 			self.toolcontext.info("*** ONLY METAMODEL", 1)
-			exit(0)
+			toolcontext.quit
 		end
 	end