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

diff --git a/src/model/mmodule.nit b/src/model/mmodule.nit
index 8927f8c..1232352 100644
--- a/src/model/mmodule.nit
+++ b/src/model/mmodule.nit
@@ -17,7 +17,6 @@
 # modules and module hierarchies in the metamodel
 module mmodule
 
-import location
 import mpackage
 private import more_collections
 
@@ -82,7 +81,13 @@ class MModule
 	var mgroup: nullable MGroup
 
 	# The path of the module source, if any
-	var filepath: nullable String = null is writable
+	#
+	# safe alias to `location.file.filepath`
+	fun filepath: nullable String do
+		var res = self.location.file
+		if res == null then return null
+		return res.filename
+	end
 
 	# The package of the module if any
 	# Safe alias for `mgroup.mpackage`
@@ -95,8 +100,7 @@ class MModule
 	# The short name of the module
 	redef var name: String
 
-	# The origin of the definition
-	var location: Location is writable
+	redef var location: Location is writable
 
 	# Alias for `name`
 	redef fun to_s do return self.name