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

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index 8369a10..83bebc2 100644
--- a/src/semantize/typing.nit
+++ b/src/semantize/typing.nit
@@ -272,6 +272,11 @@ private class TypeVisitor
 		end
 
 		var mproperty = self.try_get_mproperty_by_name2(node, unsafe_type, name)
+		if name == "new" and mproperty == null then
+			name = "init"
+			mproperty = self.try_get_mproperty_by_name2(node, unsafe_type, name)
+		end
+
 		if mproperty == null then
 			#self.modelbuilder.error(node, "Type error: property {name} not found in {unsafe_type} (ie {recvtype})")
 			if recv_is_self then
@@ -897,6 +902,9 @@ redef class AForExpr
 	var method_key: nullable CallSite
 	var method_finish: nullable CallSite
 
+	var method_lt: nullable CallSite
+	var method_successor: nullable CallSite
+
 	private fun do_type_iterator(v: TypeVisitor, mtype: MType)
 	do
 		if mtype isa MNullType then
@@ -997,6 +1005,19 @@ redef class AForExpr
 			end
 			self.method_key = keydef
 		end
+
+		if self.variables.length == 1 and n_expr isa ARangeExpr then
+			var variable = variables.first
+			var vtype = variable.declared_type.as(not null)
+
+			if n_expr isa AOrangeExpr then
+				self.method_lt = v.get_method(self, vtype, "<", false)
+			else
+				self.method_lt = v.get_method(self, vtype, "<=", false)
+			end
+
+			self.method_successor = v.get_method(self, vtype, "successor", false)
+		end
 	end
 
 	redef fun accept_typing(v)
@@ -1294,7 +1315,14 @@ redef class AAsNotnullExpr
 	end
 end
 
-redef class AProxyExpr
+redef class AParExpr
+	redef fun accept_typing(v)
+	do
+		self.mtype = v.visit_expr(self.n_expr)
+	end
+end
+
+redef class AOnceExpr
 	redef fun accept_typing(v)
 	do
 		self.mtype = v.visit_expr(self.n_expr)
@@ -1652,11 +1680,13 @@ redef class ANewExpr
 	# The constructor invoked by the new.
 	var callsite: nullable CallSite
 
+	# The designated type
+	var recvtype: nullable MClassType
+
 	redef fun accept_typing(v)
 	do
 		var recvtype = v.resolve_mtype(self.n_type)
 		if recvtype == null then return
-		self.mtype = recvtype
 
 		if not recvtype isa MClassType then
 			if recvtype isa MNullableType then
@@ -1666,26 +1696,34 @@ redef class ANewExpr
 				v.error(self, "Type error: cannot instantiate the formal type {recvtype}.")
 				return
 			end
-		else
-			if recvtype.mclass.kind == abstract_kind then
-				v.error(self, "Cannot instantiate abstract class {recvtype}.")
-				return
-			else if recvtype.mclass.kind == interface_kind then
-				v.error(self, "Cannot instantiate interface {recvtype}.")
-				return
-			end
 		end
 
+		self.recvtype = recvtype
+
 		var name: String
 		var nid = self.n_id
 		if nid != null then
 			name = nid.text
 		else
-			name = "init"
+			name = "new"
 		end
 		var callsite = v.get_method(self, recvtype, name, false)
 		if callsite == null then return
 
+		if not callsite.mproperty.is_new then
+			if recvtype.mclass.kind == abstract_kind then
+				v.error(self, "Cannot instantiate abstract class {recvtype}.")
+				return
+			else if recvtype.mclass.kind == interface_kind then
+				v.error(self, "Cannot instantiate interface {recvtype}.")
+				return
+			end
+			self.mtype = recvtype
+		else
+			self.mtype = callsite.msignature.return_mtype
+			assert self.mtype != null
+		end
+
 		self.callsite = callsite
 
 		if not callsite.mproperty.is_init_for(recvtype.mclass) then