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

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index 5c9adeb..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
@@ -377,11 +382,18 @@ private class TypeVisitor
 			self.visit_expr_subtype(args[j], paramtype)
 		end
 		if vararg_rank >= 0 then
-			var varargs = new Array[AExpr]
 			var paramtype = msignature.mparameters[vararg_rank].mtype
-			for j in [vararg_rank..vararg_rank+vararg_decl] do
-				varargs.add(args[j])
-				self.visit_expr_subtype(args[j], paramtype)
+			var first = args[vararg_rank]
+			if vararg_decl == 0 and first isa AVarargExpr then
+				var mclass = get_mclass(node, "Array")
+				if mclass == null then return false # Forward error
+				var array_mtype = mclass.get_mtype([paramtype])
+				self.visit_expr_subtype(first.n_expr, array_mtype)
+				first.mtype  = first.n_expr.mtype
+			else
+				for j in [vararg_rank..vararg_rank+vararg_decl] do
+					self.visit_expr_subtype(args[j], paramtype)
+				end
 			end
 		end
 		return true
@@ -1303,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)
@@ -1661,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
@@ -1675,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
@@ -1794,6 +1823,16 @@ redef class AIssetAttrExpr
 	end
 end
 
+redef class AVarargExpr
+	redef fun accept_typing(v)
+	do
+		# This kind of pseudo-expression can be only processed trough a signature
+		# See `check_signature`
+		# Other cases are a syntax error.
+		v.error(self, "Syntax error: unexpected `...`")
+	end
+end
+
 ###
 
 redef class ADebugTypeExpr