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

diff --git a/src/phase.nit b/src/phase.nit
index e40f19c..502d817 100644
--- a/src/phase.nit
+++ b/src/phase.nit
@@ -21,7 +21,7 @@ import poset
 
 redef class ToolContext
 	# The various registered phases to performs
-	# The order in the poset is the dependance of phases
+	# The order in the poset is the dependence of phases
 	#
 	# While you can directly modify the poset (nodes and edges),
 	# it is often simpler to use the constructor in `Phase`
@@ -30,11 +30,14 @@ redef class ToolContext
 	# --disable-phase
 	var opt_disable_phase = new OptionArray("DEBUG: Disable a specific phase; use `list` to get the list.", "--disable-phase")
 
+	# --disable-phase
+	var opt_sloppy = new OptionBool("DEBUG: force lazy semantic analysis of the source-code", "--sloppy")
+
 	redef init
 	do
 		super
 
-		option_context.add_option(opt_disable_phase)
+		option_context.add_option(opt_disable_phase, opt_sloppy)
 	end
 
 	redef fun process_options(args)
@@ -62,10 +65,12 @@ redef class ToolContext
 			end
 			if not found then fatal_error(null, "Error: no phase named `{v}`. Use `list` to list all phases.")
 		end
+
+		if opt_sloppy.value then semantize_is_lazy = true
 	end
 
-	fun phases_list: Sequence[Phase]
-	do
+	# The list of registered phases in the application order.
+	var phases_list: Sequence[Phase] is lazy do
 		var phases = self.phases.to_a
 		self.phases.sort(phases)
 		return phases
@@ -105,7 +110,6 @@ redef class ToolContext
 
 			for phase in phases do
 				if phase.disabled then continue
-				self.info(" phase: {phase}", 3)
 				assert phase.toolcontext == self
 				var errcount = self.error_count
 				phase.process_nmodule(nmodule)
@@ -127,7 +131,10 @@ redef class ToolContext
 					break
 				end
 				for na in vannot.annotations do
-					phase.process_annotated_node(na.parent.parent.as(not null), na)
+					var p = na.parent
+					if p isa AAnnotations then p = p.parent
+					assert p != null
+					phase.process_annotated_node(p, na)
 				end
 				if errcount != self.error_count then
 					self.check_errors
@@ -140,10 +147,12 @@ redef class ToolContext
 		var time1 = get_time
 		self.info("*** END SEMANTIC ANALYSIS: {time1-time0} ***", 2)
 
-		errors_info
+		self.check_errors
 	end
 
-	fun phase_process_npropdef(phase: Phase, npropdef: APropdef)
+	# Process the given `phase` on the `npropdef`
+	# Called by `run_phases`
+	protected fun phase_process_npropdef(phase: Phase, npropdef: APropdef)
 	do
 		phase.process_npropdef(npropdef)
 	end