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

diff --git a/src/loader.nit b/src/loader.nit
index 818f049..9876bc4 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -72,8 +72,9 @@ redef class ModelBuilder
 			if nmodule == null then continue # Skip error
 			# Load imported module
 			build_module_importation(nmodule)
-
-			mmodules.add(nmodule.mmodule.as(not null))
+			var mmodule = nmodule.mmodule
+			if mmodule == null then continue # skip error
+			mmodules.add mmodule
 		end
 		var time1 = get_time
 		self.toolcontext.info("*** END PARSE: {time1-time0} ***", 2)
@@ -100,8 +101,9 @@ redef class ModelBuilder
 				if nmodule == null then continue # Skip error
 				# Load imported module
 				build_module_importation(nmodule)
-
-				res.add(nmodule.mmodule.as(not null))
+				var mmodule = nmodule.mmodule
+				if mmodule == null then continue # Skip error
+				res.add mmodule
 			end
 		end
 		return res
@@ -154,7 +156,9 @@ redef class ModelBuilder
 						var nmodule = self.load_module(af)
 						if nmodule == null then continue # Skip error
 						build_module_importation(nmodule)
-						mmodules.add(nmodule.mmodule.as(not null))
+						var mmodule = nmodule.mmodule
+						if mmodule == null then continue # Skip error
+						mmodules.add mmodule
 					else
 						self.toolcontext.info("ignore file {af}", 2)
 					end
@@ -166,8 +170,9 @@ redef class ModelBuilder
 			if nmodule == null then continue # Skip error
 			# Load imported module
 			build_module_importation(nmodule)
-
-			mmodules.add(nmodule.mmodule.as(not null))
+			var mmodule = nmodule.mmodule
+			if mmodule == null then continue # Skip error
+			mmodules.add mmodule
 		end
 		var time1 = get_time
 		self.toolcontext.info("*** END PARSE: {time1-time0} ***", 2)
@@ -261,7 +266,7 @@ redef class ModelBuilder
 		if res == null then return null # Forward error
 		# Load imported module
 		build_module_importation(res)
-		return res.mmodule.as(not null)
+		return res.mmodule
 	end
 
 	# Search a module `name` from path `lookpaths`.
@@ -389,12 +394,15 @@ redef class ModelBuilder
 			return mgroups[rdp]
 		end
 
-		# Hack, a group is determined by:
+		# Hack, a group is determined by one of the following:
 		# * the presence of a honomymous nit file
 		# * the fact that the directory is named `src`
+		# * the fact that there is a sub-directory named `src`
 		var pn = rdp.basename(".nit")
 		var mp = dirpath.join_path(pn + ".nit").simplify_path
 
+		# dirpath2 is the root directory
+		# dirpath is the src subdirectory directory, if any, else it is the same that dirpath2
 		var dirpath2 = dirpath
 		if not mp.file_exists then
 			if pn == "src" then
@@ -402,12 +410,17 @@ redef class ModelBuilder
 				dirpath2 = rdp.dirname
 				pn = dirpath2.basename("")
 			else
-				return null
+				# Check a `src` subdirectory
+				dirpath = dirpath2 / "src"
+				if not dirpath.file_exists then
+					# All rules failed, so return null
+					return null
+				end
 			end
 		end
 
 		# check parent directory
-		var parentpath = dirpath.join_path("..").simplify_path
+		var parentpath = dirpath2.join_path("..").simplify_path
 		var parent = get_mgroup(parentpath)
 
 		var mgroup
@@ -435,7 +448,8 @@ redef class ModelBuilder
 		end
 
 		mgroup.filepath = dirpath
-		mgroups[rdp] = mgroup
+		mgroups[module_absolute_path(dirpath)] = mgroup
+		mgroups[module_absolute_path(dirpath2)] = mgroup
 		return mgroup
 	end
 
@@ -658,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}.")
+				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}.")
+				nmodule.mmodule = null # invalidate the module
 				return
 			end
 			mmodule.set_visibility_for(sup, mvisibility)
@@ -683,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