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

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index e283b43..e4fef02 100644
--- a/src/semantize/typing.nit
+++ b/src/semantize/typing.nit
@@ -246,10 +246,7 @@ private class TypeVisitor
 
 	fun get_mclass(node: ANode, name: String): nullable MClass
 	do
-		var mclass = modelbuilder.try_get_mclass_by_name(node, mmodule, name)
-		if mclass == null then
-			self.modelbuilder.error(node, "Type Error: missing primitive class `{name}'.")
-		end
+		var mclass = modelbuilder.get_mclass_by_name(node, mmodule, name)
 		return mclass
 	end
 
@@ -267,7 +264,7 @@ private class TypeVisitor
 		#debug("recv: {recvtype} (aka {unsafe_type})")
 		if recvtype isa MNullType then
 			# `null` only accepts some methods of object.
-			if name == "==" or name == "!=" then
+			if name == "==" or name == "!=" or name == "is_same_instance" then
 				unsafe_type = mmodule.object_type.as_nullable
 			else
 				self.error(node, "Error: Method '{name}' call on 'null'.")
@@ -328,7 +325,8 @@ private class TypeVisitor
 		end
 
 
-		var msignature = mpropdef.new_msignature or else mpropdef.msignature.as(not null)
+		var msignature = mpropdef.new_msignature or else mpropdef.msignature
+		if msignature == null then return null # skip error
 		msignature = resolve_for(msignature, recvtype, recv_is_self).as(MSignature)
 
 		var erasure_cast = false
@@ -569,14 +567,18 @@ redef class AMethPropdef
 		var nblock = self.n_block
 		if nblock == null then return
 
-		var mpropdef = self.mpropdef.as(not null)
+		var mpropdef = self.mpropdef
+		if mpropdef == null then return # skip error
+
 		var v = new TypeVisitor(modelbuilder, mpropdef.mclassdef.mmodule, mpropdef)
 		self.selfvariable = v.selfvariable
 
 		var mmethoddef = self.mpropdef.as(not null)
-		for i in [0..mmethoddef.msignature.arity[ do
-			var mtype = mmethoddef.msignature.mparameters[i].mtype
-			if mmethoddef.msignature.vararg_rank == i then
+		var msignature = mmethoddef.msignature
+		if msignature == null then return # skip error
+		for i in [0..msignature.arity[ do
+			var mtype = msignature.mparameters[i].mtype
+			if msignature.vararg_rank == i then
 				var arrayclass = v.get_mclass(self.n_signature.n_params[i], "Array")
 				if arrayclass == null then return # Skip error
 				mtype = arrayclass.get_mtype([mtype])
@@ -587,7 +589,7 @@ redef class AMethPropdef
 		end
 		v.visit_stmt(nblock)
 
-		if not nblock.after_flow_context.is_unreachable and mmethoddef.msignature.return_mtype != null then
+		if not nblock.after_flow_context.is_unreachable and msignature.return_mtype != null then
 			# We reach the end of the function without having a return, it is bad
 			v.error(self, "Control error: Reached end of function (a 'return' with a value was expected).")
 		end
@@ -597,7 +599,11 @@ end
 redef class AAttrPropdef
 	redef fun do_typing(modelbuilder: ModelBuilder)
 	do
-		var mpropdef = self.mpropdef.as(not null)
+		if not has_value then return
+
+		var mpropdef = self.mpropdef
+		if mpropdef == null then return # skip error
+
 		var v = new TypeVisitor(modelbuilder, mpropdef.mclassdef.mmodule, mpropdef)
 		self.selfvariable = v.selfvariable
 
@@ -609,6 +615,10 @@ redef class AAttrPropdef
 		var nblock = self.n_block
 		if nblock != null then
 			v.visit_stmt(nblock)
+			if not nblock.after_flow_context.is_unreachable then
+				# We reach the end of the init without having a return, it is bad
+				v.error(self, "Control error: Reached end of block (a 'return' with a value was expected).")
+			end
 		end
 	end
 end
@@ -975,7 +985,7 @@ redef class AForExpr
 			is_col = true
 		end
 
-		if mapit_cla != null and v.is_subtype(ittype, mapit_cla.get_mtype([objcla.mclass_type, objcla.mclass_type.as_nullable])) then
+		if mapit_cla != null and v.is_subtype(ittype, mapit_cla.get_mtype([objcla.mclass_type.as_nullable, objcla.mclass_type.as_nullable])) then
 			# Map Iterator
 			var coltype = ittype.supertype_to(v.mmodule, v.anchor, mapit_cla)
 			var variables = self.variables
@@ -1243,7 +1253,7 @@ redef class AArrayExpr
 		if mtype == null then
 			mtype = v.merge_types(self, mtypes)
 		end
-		if mtype == null then
+		if mtype == null or mtype isa MNullType then
 			v.error(self, "Type Error: ambiguous array type {mtypes.join(" ")}")
 			return
 		end
@@ -1811,7 +1821,8 @@ redef class AAttrFormExpr
 		var mpropdefs = mproperty.lookup_definitions(v.mmodule, unsafe_type)
 		assert mpropdefs.length == 1
 		var mpropdef = mpropdefs.first
-		var attr_type = mpropdef.static_mtype.as(not null)
+		var attr_type = mpropdef.static_mtype
+		if attr_type == null then return # skip error
 		attr_type = v.resolve_for(attr_type, recvtype, self.n_expr isa ASelfExpr)
 		self.attr_type = attr_type
 	end