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

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index 0634ee2..38a689a 100644
--- a/src/semantize/typing.nit
+++ b/src/semantize/typing.nit
@@ -279,10 +279,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
 
@@ -301,7 +298,9 @@ private class TypeVisitor
 		if recvtype isa MNullType then
 			# `null` only accepts some methods of object.
 			if name == "==" or name == "!=" or name == "is_same_instance" then
-				unsafe_type = mmodule.object_type.as_nullable
+				var objclass = get_mclass(node, "Object")
+				if objclass == null then return null # Forward error
+				unsafe_type = objclass.mclass_type
 			else
 				self.error(node, "Error: Method '{name}' call on 'null'.")
 				return null
@@ -361,7 +360,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
@@ -602,14 +602,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])
@@ -620,7 +624,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
@@ -632,7 +636,9 @@ redef class AAttrPropdef
 	do
 		if not has_value 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
 
@@ -731,7 +737,9 @@ redef class AVardeclExpr
 
 		var decltype = mtype
 		if mtype == null or mtype isa MNullType then
-			decltype = v.get_mclass(self, "Object").mclass_type.as_nullable
+			var objclass = v.get_mclass(self, "Object")
+			if objclass == null then return # skip error
+			decltype = objclass.mclass_type.as_nullable
 			if mtype == null then mtype = decltype
 		end
 
@@ -1162,7 +1170,9 @@ redef class AOrElseExpr
 
 		var t = v.merge_types(self, [t1, t2])
 		if t == null then
-			t = v.mmodule.object_type
+			var c = v.get_mclass(self, "Object")
+			if c == null then return # forward error
+			t = c.mclass_type
 			if v.can_be_null(t2) then
 				t = t.as_nullable
 			end
@@ -1228,8 +1238,11 @@ redef class ASuperstringExpr
 		var mclass = v.get_mclass(self, "String")
 		if mclass == null then return # Forward error
 		self.mtype = mclass.mclass_type
+		var objclass = v.get_mclass(self, "Object")
+		if objclass == null then return # Forward error
+		var objtype = objclass.mclass_type
 		for nexpr in self.n_exprs do
-			v.visit_expr_subtype(nexpr, v.mmodule.object_type)
+			v.visit_expr_subtype(nexpr, objtype)
 		end
 	end
 end
@@ -1844,7 +1857,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