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

diff --git a/src/nitni/nitni_callbacks.nit b/src/nitni/nitni_callbacks.nit
index 210a4b5..6d05196 100644
--- a/src/nitni/nitni_callbacks.nit
+++ b/src/nitni/nitni_callbacks.nit
@@ -287,7 +287,7 @@ redef class ALocalPropExternCall
 			mmodule, mclass_type, m_name )
 
 		if method == null then
-			toolcontext.error(location, "Local method {m_name} not found.")
+			toolcontext.error(location, "Error: local method `{m_name}` not found.")
 			return
 		end
 
@@ -304,7 +304,7 @@ redef class AFullPropExternCall
 		var mmodule = npropdef.mpropdef.mclassdef.mmodule
 		var mclassdef = npropdef.mpropdef.mclassdef
 		var mclass_type = mclassdef.bound_mtype
-		var mtype = toolcontext.modelbuilder.resolve_mtype(mmodule, mclassdef, n_type)
+		var mtype = toolcontext.modelbuilder.resolve_mtype(mclassdef, n_type)
 
 		if mtype == null then return
 
@@ -313,7 +313,7 @@ redef class AFullPropExternCall
 		end
 
 		if mtype isa MNullableType then
-			toolcontext.error(location, "Type {n_type.collect_text} is nullable and thus cannot be the receiver." )
+			toolcontext.error(location, "Error: type `{n_type.collect_text}` is nullable and thus cannot be the receiver." )
 			return
 		end
 
@@ -322,7 +322,7 @@ redef class AFullPropExternCall
 			mmodule, mtype, m_name )
 
 		if method == null then
-			toolcontext.error(location, "Method {m_name} not found in {n_type.collect_text}." )
+			toolcontext.error(location, "Error: method `{m_name}` not found in `{n_type.collect_text}`." )
 			return
 		end
 
@@ -337,11 +337,11 @@ redef class AInitPropExternCall
 	do
 		var mmodule = npropdef.mpropdef.mclassdef.mmodule
 		var mclassdef = npropdef.mpropdef.mclassdef
-		var mtype = toolcontext.modelbuilder.resolve_mtype(mmodule, mclassdef, n_type)
+		var mtype = toolcontext.modelbuilder.resolve_mtype(mclassdef, n_type)
 		if mtype == null then return
 
 		if not mtype isa MClassType then
-			toolcontext.error(location, "Type {n_type.collect_text} is not a class and thus cannot be used to instanciate a new instance." )
+			toolcontext.error(location, "Error: type `{n_type.collect_text}` is not a class and thus cannot be used to instantiate a new instance." )
 			return
 		end
 
@@ -356,7 +356,7 @@ redef class AInitPropExternCall
 		end
 
 		if meth == null then
-			toolcontext.error(location, "Method {meth_name} not found in {n_type.collect_text}." )
+			toolcontext.error(location, "Error: method `{meth_name}` not found in `{n_type.collect_text}`." )
 			return
 		end
 
@@ -398,9 +398,8 @@ redef class ACastAsExternCall
 	redef fun verify_and_collect(npropdef, callback_set, toolcontext)
 	do
 		var mclassdef = npropdef.mpropdef.mclassdef
-		var mmodule = mclassdef.mmodule
-		toolcontext.modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, n_from_type, true)
-		toolcontext.modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, n_to_type, true)
+		toolcontext.modelbuilder.resolve_mtype_unchecked(mclassdef, n_from_type, true)
+		toolcontext.modelbuilder.resolve_mtype_unchecked(mclassdef, n_to_type, true)
 		super
 	end
 end
@@ -412,8 +411,7 @@ redef class AAsNullableExternCall
 	redef fun verify_and_collect(npropdef, callback_set, toolcontext)
 	do
 		var mclassdef = npropdef.mpropdef.mclassdef
-		var mmodule = mclassdef.mmodule
-		toolcontext.modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, n_type, true)
+		toolcontext.modelbuilder.resolve_mtype_unchecked(mclassdef, n_type, true)
 		super
 	end
 end
@@ -429,8 +427,7 @@ redef class AAsNotNullableExternCall
 	redef fun verify_and_collect(npropdef, callback_set, toolcontext)
 	do
 		var mclassdef = npropdef.mpropdef.mclassdef
-		var mmodule = mclassdef.mmodule
-		toolcontext.modelbuilder.resolve_mtype_unchecked(mmodule, mclassdef, n_type, true)
+		toolcontext.modelbuilder.resolve_mtype_unchecked(mclassdef, n_type, true)
 		super
 	end
 end