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

diff --git a/src/loader.nit b/src/loader.nit
index 312d02b..0e6878b 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -245,9 +245,9 @@ redef class ModelBuilder
 
 		if candidate == null then
 			if mgroup != null then
-				error(anode, "Error: cannot find module {name} from {mgroup.name}. tried {lookpaths.join(", ")}")
+				error(anode, "Error: cannot find module `{name}` from `{mgroup.name}`. Tried: {lookpaths.join(", ")}.")
 			else
-				error(anode, "Error: cannot find module {name}. tried {lookpaths.join(", ")}")
+				error(anode, "Error: cannot find module `{name}`. Tried: {lookpaths.join(", ")}.")
 			end
 			return null
 		end
@@ -284,7 +284,7 @@ redef class ModelBuilder
 					var abs_candidate = module_absolute_path(candidate)
 					var abs_try_file = module_absolute_path(try_file)
 					if abs_candidate != abs_try_file then
-						toolcontext.error(location, "Error: conflicting module file for {name}: {candidate} {try_file}")
+						toolcontext.error(location, "Error: conflicting module file for `{name}`: `{candidate}` `{try_file}`")
 					end
 				end
 			end
@@ -297,7 +297,7 @@ redef class ModelBuilder
 					var abs_candidate = module_absolute_path(candidate)
 					var abs_try_file = module_absolute_path(try_file)
 					if abs_candidate != abs_try_file then
-						toolcontext.error(location, "Error: conflicting module file for {name}: {candidate} {try_file}")
+						toolcontext.error(location, "Error: conflicting module file for `{name}`: `{candidate}` `{try_file}`")
 					end
 				end
 			end
@@ -485,11 +485,11 @@ redef class ModelBuilder
 	fun load_module_ast(filename: String): nullable AModule
 	do
 		if filename.file_extension != "nit" then
-			self.toolcontext.error(null, "Error: file {filename} is not a valid nit module.")
+			self.toolcontext.error(null, "Error: file `{filename}` is not a valid nit module.")
 			return null
 		end
 		if not filename.file_exists then
-			self.toolcontext.error(null, "Error: file {filename} not found.")
+			self.toolcontext.error(null, "Error: file `{filename}` not found.")
 			return null
 		end
 
@@ -607,7 +607,7 @@ redef class ModelBuilder
 		if decl != null then
 			var decl_name = decl.n_name.n_id.text
 			if decl_name != mod_name then
-				error(decl.n_name, "Error: module name missmatch; declared {decl_name} file named {mod_name}")
+				error(decl.n_name, "Error: module name mismatch; declared {decl_name} file named {mod_name}.")
 			end
 		end
 
@@ -618,7 +618,7 @@ redef class ModelBuilder
 				if other.mgroup!= null and other.mgroup.mproject == mgroup.mproject then
 					var node: ANode
 					if decl == null then node = nmodule else node = decl.n_name
-					error(node, "Error: A module named `{other.full_name}` already exists at {other.location}")
+					error(node, "Error: a module named `{other.full_name}` already exists at {other.location}.")
 					break
 				end
 			end
@@ -672,24 +672,33 @@ redef class ModelBuilder
 			if aimport.n_name.n_quad != null then mgroup = null # Start from top level
 			for grp in aimport.n_name.n_path do
 				var path = search_mmodule_by_name(grp, mgroup, grp.text)
-				if path == null then return # Skip error
+				if path == null then
+					nmodule.mmodule = null # invalidate the module
+					return # Skip error
+				end
 				mgroup = path.mgroup
 			end
 			var mod_name = aimport.n_name.n_id.text
 			var sup = self.get_mmodule_by_name(aimport.n_name, mgroup, mod_name)
-			if sup == null then continue # Skip error
+			if sup == null then
+				nmodule.mmodule = null # invalidate the module
+				continue # Skip error
+			end
 			aimport.mmodule = sup
 			imported_modules.add(sup)
 			var mvisibility = aimport.n_visibility.mvisibility
 			if mvisibility == protected_visibility then
 				error(aimport.n_visibility, "Error: only properties can be protected.")
+				nmodule.mmodule = null # invalidate the module
 				return
 			end
 			if sup == mmodule then
-				error(aimport.n_name, "Error: Dependency loop in module {mmodule}.")
+				error(aimport.n_name, "Error: dependency loop in module {mmodule}.")
+				nmodule.mmodule = null # invalidate the module
 			end
 			if sup.in_importation < mmodule then
-				error(aimport.n_name, "Error: Dependency loop between modules {mmodule} and {sup}.")
+				error(aimport.n_name, "Error: dependency loop between modules {mmodule} and {sup}.")
+				nmodule.mmodule = null # invalidate the module
 				return
 			end
 			mmodule.set_visibility_for(sup, mvisibility)
@@ -697,7 +706,9 @@ redef class ModelBuilder
 		if stdimport then
 			var mod_name = "standard"
 			var sup = self.get_mmodule_by_name(nmodule, null, mod_name)
-			if sup != null then # Skip error
+			if sup == null then
+				nmodule.mmodule = null # invalidate the module
+			else # Skip error
 				imported_modules.add(sup)
 				mmodule.set_visibility_for(sup, public_visibility)
 			end