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

diff --git a/src/mmloader.nit b/src/mmloader.nit
index 4dfc361..c20657a 100644
--- a/src/mmloader.nit
+++ b/src/mmloader.nit
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This package is used to load a metamodel 
+# This module is used to load a metamodel
 package mmloader
 
 import metamodel
@@ -24,7 +24,7 @@ import opts
 import location
 
 class Message
-special Comparable
+	super Comparable
 	redef type OTHER: Message
 
 	readable var _location: nullable Location
@@ -37,7 +37,8 @@ special Comparable
 		return location.as(not null) < other.location.as(not null)
 	end
 
-	redef fun to_s: String do
+	redef fun to_s: String
+	do
 		var l = location
 		if l == null then
 			return text
@@ -45,11 +46,54 @@ special Comparable
 			return "{l}: {text}"
 		end
 	end
+
+	fun to_color_string: String
+	do
+		var esc = 27.ascii
+		var red = "{esc}[0;31m"
+		var bred = "{esc}[1;31m"
+		var green = "{esc}[0;32m"
+		var yellow = "{esc}[0;33m"
+		var def = "{esc}[0m"
+
+		var l = location
+		if l == null then
+			return text
+		else if l.file == null then
+			return "{yellow}{l}{def}: {text}"
+		else
+			var i = location.line_start
+			var line_start = l.file.line_starts[i-1]
+			var line_end = line_start
+			var string = l.file.string
+			while line_end+1 < string.length and string[line_end+1] != '\n' and string[line_end+1] != '\r' do
+				line_end += 1
+			end
+			var lstart = string.substring(line_start, location.column_start - 1)
+			var cend
+			if i != location.line_end then
+				cend = line_end - line_start + 1
+			else
+				cend = location.column_end
+			end
+			var lmid = string.substring(line_start + location.column_start - 1, cend - location.column_start + 1)
+			var lend = string.substring(line_start + cend, line_end - line_start - cend + 1)
+			var indent = new Buffer
+			for j in [line_start..line_start+location.column_start-1[ do
+				if string[j] == '\t' then
+					indent.add '\t'
+				else
+					indent.add ' '
+				end
+			end
+			return "{yellow}{l}{def}: {text}\n\t{lstart}{bred}{lmid}{def}{lend}\n\t{indent}^"
+		end
+	end
 end
 
 # Global context for tools
 class ToolContext
-special MMContext
+	super MMContext
 	# Number of errors
 	readable var _error_count: Int = 0
 
@@ -69,7 +113,11 @@ special MMContext
 			_message_sorter.sort(_messages)
 
 			for m in _messages do
-				stderr.write("{m}\n")
+				if opt_no_color.value then
+					stderr.write("{m}\n")
+				else
+					stderr.write("{m.to_color_string}\n")
+				end
 			end
 
 			_messages.clear
@@ -83,6 +131,7 @@ special MMContext
 	do
 		_messages.add(new Message(l,s))
 		_error_count = _error_count + 1
+		if opt_stop_on_first_error.value then check_errors
 	end
 
 	# Add an error, show errors and quit
@@ -102,6 +151,7 @@ special MMContext
 		else
 			_error_count = _error_count + 1
 		end
+		if opt_stop_on_first_error.value then check_errors
 	end
 
 	# Display an info
@@ -148,13 +198,19 @@ special MMContext
 	# Option --verbose
 	readable var _opt_verbose: OptionCount = new OptionCount("Verbose", "-v", "--verbose")
 
+	# Option --stop-on-first-error
+	readable var _opt_stop_on_first_error: OptionBool = new OptionBool("Stop on first error", "--stop-on-first-error")
+
+	# Option --no-color
+	readable var _opt_no_color: OptionBool = new OptionBool("Do not use color to display errors and warnings", "--no-color")
+
 	# Verbose level
 	readable var _verbose_level: Int = 0
 
 	init
 	do
 		super
-		option_context.add_option(opt_warn, opt_path, opt_log, opt_log_dir, opt_only_parse, opt_only_metamodel, opt_help, opt_version, opt_verbose)
+		option_context.add_option(opt_warn, opt_stop_on_first_error, opt_no_color, opt_path, opt_log, opt_log_dir, opt_only_parse, opt_only_metamodel, opt_help, opt_version, opt_verbose)
 	end
 
 	# Parse and process the options given on the command line
@@ -364,7 +420,7 @@ class ModuleLoader
 	protected fun parse_file(context: ToolContext, file: IFStream, filename: String, module_name: Symbol, dir: MMDirectory): MODULE is abstract
 
 	# Process a parsed module
-	protected fun process_metamodel(context: ToolContext, module: MODULE) is abstract
+	protected fun process_metamodel(context: ToolContext, mod: MODULE) is abstract
 end
 
 redef class MMModule