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

diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit
index 0115714..50f3c8e 100644
--- a/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@ -1845,7 +1845,7 @@ redef class MMethodDef
 		if modelbuilder.mpropdef2npropdef.has_key(self) then
 			var npropdef = modelbuilder.mpropdef2npropdef[self]
 			return npropdef.can_inline
-		else if self.mproperty.name == "init" then
+		else if self.mproperty.is_root_init then
 			# Automatic free init is always inlined since it is empty or contains only attribtes assigments
 			return true
 		else
@@ -1865,7 +1865,7 @@ redef class MMethodDef
 			self.compile_parameter_check(v, arguments)
 			npropdef.compile_to_c(v, self, arguments)
 			v.current_node = oldnode
-		else if self.mproperty.name == "init" then
+		else if self.mproperty.is_root_init then
 			var nclassdef = modelbuilder.mclassdef2nclassdef[self.mclassdef]
 			var oldnode = v.current_node
 			v.current_node = nclassdef
@@ -1989,8 +1989,6 @@ redef class AMethPropdef
 		var ret = mpropdef.msignature.return_mtype
 		if ret != null then
 			ret = v.resolve_for(ret, arguments.first)
-		else if mpropdef.mproperty.is_new then
-			ret = arguments.first.mcasttype
 		end
 		if pname != "==" and pname != "!=" then
 			v.adapt_signature(mpropdef, arguments)
@@ -2171,7 +2169,7 @@ redef class AMethPropdef
 			else if pname == "atoi" then
 				v.ret(v.new_expr("atoi({arguments[0]});", ret.as(not null)))
 				return true
-			else if pname == "init" then
+			else if pname == "new" then
 				v.ret(v.new_expr("(char*)nit_alloc({arguments[1]})", ret.as(not null)))
 				return true
 			end
@@ -2403,8 +2401,7 @@ redef class AExpr
 	# Do not call this method directly, use `v.stmt` instead
 	private fun stmt(v: AbstractCompilerVisitor)
 	do
-		var res = expr(v)
-		if res != null then v.add("{res};")
+		expr(v)
 	end
 end
 
@@ -2446,12 +2443,6 @@ redef class AVarExpr
 end
 
 redef class AVarAssignExpr
-	redef fun stmt(v)
-	do
-		var variable = self.variable.as(not null)
-		var i = v.expr(self.n_value, variable.declared_type)
-		v.assign(v.variable(variable), i)
-	end
 	redef fun expr(v)
 	do
 		var variable = self.variable.as(not null)
@@ -2945,12 +2936,13 @@ redef class AAttrExpr
 end
 
 redef class AAttrAssignExpr
-	redef fun stmt(v)
+	redef fun expr(v)
 	do
 		var recv = v.expr(self.n_expr, null)
 		var i = v.expr(self.n_value, null)
 		var mproperty = self.mproperty.as(not null)
 		v.write_attribute(mproperty, recv, i)
+		return i
 	end
 end