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

diff --git a/src/toolcontext.nit b/src/toolcontext.nit
index f86d1e2..a5b7ceb 100644
--- a/src/toolcontext.nit
+++ b/src/toolcontext.nit
@@ -24,6 +24,7 @@ import opts
 import location
 import version
 import template
+import more_collections
 
 # A warning or an error
 class Message
@@ -105,9 +106,39 @@ class ToolContext
 	private var messages = new Array[Message]
 	private var message_sorter: Comparator = default_comparator
 
-	# Output all current stacked messages.
-	# If some errors occurred, exits the program.
-	fun check_errors
+	# Does an error prevent the program to stop at `check_errors`?
+	#
+	# Default to false.
+	# Set this value to `true` if you need to keep the program going in case of error.
+	var keep_going = false is writable
+
+	# List of tags per source-file whose warnings are not displayed.
+	#
+	# Initially empty, it is up to the toll to fill it.
+	# The tag "all" means all warnings and advices.
+	var warning_blacklist = new MultiHashMap[SourceFile, String]
+
+	# Is the source-file of `l` associated with `tag` in `warning_blacklist`?
+	#
+	# currently returns `false` if `l` is null or does not have a source-file.
+	fun is_warning_blacklisted(l: nullable Location, tag: String): Bool
+	do
+		if l == null then return false
+		var f = l.file
+		if f == null then return false
+		var tags = warning_blacklist.get_or_null(f)
+		if tags == null then return false
+		return tags.has("all") or tags.has(tag)
+	end
+
+	# Output all current stacked messages and display total error informations
+	#
+	# Return true if no errors occurred.
+	#
+	# If some errors occurred, the behavior depends on the value of `keep_going`.
+	# If `keep_going` is false, then the program exits.
+	# Else, the error count and the warning count are reset and false is returned.
+	fun check_errors: Bool
 	do
 		if messages.length > 0 then
 			message_sorter.sort(messages)
@@ -125,16 +156,20 @@ class ToolContext
 
 		if error_count > 0 then
 			errors_info
-			exit(1)
+			if not keep_going then exit(1)
+			return false
 		end
+		return true
 	end
 
-	# Display total error informations
+	# Display (and reset) total error informations
 	fun errors_info
 	do
 		if error_count == 0 and warning_count == 0 then return
 		if opt_no_color.value then return
 		sys.stderr.write "Errors: {error_count}. Warnings: {warning_count}.\n"
+		error_count = 0
+		warning_count = 0
 	end
 
 	# Display an error
@@ -166,6 +201,7 @@ class ToolContext
 	do
 		if opt_warning.value.has("no-{tag}") then return
 		if not opt_warning.value.has(tag) and opt_warn.value == 0 then return
+		if is_warning_blacklisted(l, tag) then return
 		messages.add(new Message(l, tag, text))
 		warning_count = warning_count + 1
 		if opt_stop_on_first_error.value then check_errors
@@ -188,6 +224,7 @@ class ToolContext
 	do
 		if opt_warning.value.has("no-{tag}") then return
 		if not opt_warning.value.has(tag) and opt_warn.value <= 1 then return
+		if is_warning_blacklisted(l, tag) then return
 		messages.add(new Message(l, tag, text))
 		warning_count = warning_count + 1
 		if opt_stop_on_first_error.value then check_errors
@@ -205,28 +242,30 @@ class ToolContext
 	#
 	# Stops execution and prints errors if the program isn't available or didn't end correctly
 	fun exec_and_check(args: Array[String], error: String)
-        do
-                var prog = args.first
-                args.remove_at 0
-
-                # Is the wanted program available?
-                var proc_which = new IProcess.from_a("which", [prog])
-                proc_which.wait
-                var res = proc_which.status
-                if res != 0 then
-                        print "{error}: executable \"{prog}\" not found"
-                        exit 1
-                end
-
-                # Execute the wanted program
-                var proc = new Process.from_a(prog, args)
-                proc.wait
-                res = proc.status
-                if res != 0 then
-                        print "{error}: execution of \"{prog} {args.join(" ")}\" failed"
-                        exit 1
-                end
-        end
+	do
+		info("+ {args.join(" ")}", 2)
+
+		var prog = args.first
+		args.remove_at 0
+
+		# Is the wanted program available?
+		var proc_which = new ProcessReader.from_a("which", [prog])
+		proc_which.wait
+		var res = proc_which.status
+		if res != 0 then
+			print "{error}: executable \"{prog}\" not found"
+			exit 1
+		end
+
+		# Execute the wanted program
+		var proc = new Process.from_a(prog, args)
+		proc.wait
+		res = proc.status
+		if res != 0 then
+			print "{error}: execution of \"{prog} {args.join(" ")}\" failed"
+			exit 1
+		end
+	end
 
 	# Global OptionContext
 	var option_context = new OptionContext
@@ -484,10 +523,6 @@ class BashCompletion
 
 	var toolcontext: ToolContext
 
-	init(toolcontext: ToolContext) do
-		self.toolcontext = toolcontext
-	end
-
 	private fun extract_options_names: Array[String] do
 		var names = new Array[String]
 		for option in toolcontext.option_context.options do