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

diff --git a/src/loader.nit b/src/loader.nit
index b0d6479..65e7c67 100644
--- a/src/loader.nit
+++ b/src/loader.nit
@@ -330,8 +330,21 @@ redef class ModelBuilder
 
 	# Return the mgroup associated to a directory path.
 	# If the directory is not a group null is returned.
+	#
+	# Note: `paths` is also used to look for mgroups
 	fun get_mgroup(dirpath: String): nullable MGroup
 	do
+		if not dirpath.file_exists then do
+			for p in paths do
+				var try = p / dirpath
+				if try.file_exists then
+					dirpath = try
+					break label
+				end
+			end
+			return null
+		end label
+
 		var rdp = module_absolute_path(dirpath)
 		if mgroups.has_key(rdp) then
 			return mgroups[rdp]
@@ -373,7 +386,7 @@ redef class ModelBuilder
 		if not readme.file_exists then readme = dirpath2.join_path("README")
 		if readme.file_exists then
 			var mdoc = new MDoc
-			var s = new IFStream.open(readme)
+			var s = new FileReader.open(readme)
 			while not s.eof do
 				mdoc.content.add(s.read_line)
 			end
@@ -417,7 +430,7 @@ redef class ModelBuilder
 		self.toolcontext.info("load module {filename}", 2)
 
 		# Load the file
-		var file = new IFStream.open(filename)
+		var file = new FileReader.open(filename)
 		var lexer = new Lexer(new SourceFile(filename, file))
 		var parser = new Parser(lexer)
 		var tree = parser.parse
@@ -501,22 +514,40 @@ redef class ModelBuilder
 	do
 		# Check the module name
 		var decl = nmodule.n_moduledecl
-		if decl == null then
-			#warning(nmodule, "Warning: Missing 'module' keyword") #FIXME: NOT YET FOR COMPATIBILITY
-		else
+		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}")
 			end
 		end
 
+		# Check for conflicting module names in the project
+		if mgroup != null then
+			var others = model.get_mmodules_by_name(mod_name)
+			if others != null then for other in others do
+				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}")
+					break
+				end
+			end
+		end
+
 		# Create the module
 		var mmodule = new MModule(model, mgroup, mod_name, nmodule.location)
 		nmodule.mmodule = mmodule
 		nmodules.add(nmodule)
 		self.mmodule2nmodule[mmodule] = nmodule
 
+		var source = nmodule.location.file
+		if source != null then
+			assert source.mmodule == null
+			source.mmodule = mmodule
+		end
+
 		if decl != null then
+			# Extract documentation
 			var ndoc = decl.n_doc
 			if ndoc != null then
 				var mdoc = ndoc.to_mdoc
@@ -525,6 +556,8 @@ redef class ModelBuilder
 			else
 				advice(decl, "missing-doc", "Documentation warning: Undocumented module `{mmodule}`")
 			end
+			# Is the module a test suite?
+			mmodule.is_test_suite = not decl.get_annotations("test_suite").is_empty
 		end
 
 		return mmodule
@@ -606,8 +639,18 @@ redef class ModelBuilder
 	var nmodules = new Array[AModule]
 
 	# Register the nmodule associated to each mmodule
-	# FIXME: why not refine the `MModule` class with a nullable attribute?
-	var mmodule2nmodule = new HashMap[MModule, AModule]
+	#
+	# Public clients need to use `mmodule2node` to access stuff.
+	private var mmodule2nmodule = new HashMap[MModule, AModule]
+
+	# Retrieve the associated AST node of a mmodule.
+	# This method is used to associate model entity with syntactic entities.
+	#
+	# If the module is not associated with a node, returns null.
+	fun mmodule2node(mmodule: MModule): nullable AModule
+	do
+		return mmodule2nmodule.get_or_null(mmodule)
+	end
 end
 
 # File-system location of a module (file) that is identified but not always loaded.
@@ -649,6 +692,11 @@ redef class MGroup
 
 end
 
+redef class SourceFile
+	# Associated mmodule, once created
+	var mmodule: nullable MModule = null
+end
+
 redef class AStdImport
 	# The imported module once determined
 	var mmodule: nullable MModule = null