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

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 1181cf0..189f293 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -25,7 +25,7 @@ import primitive_types
 
 redef class ToolContext
 	# --discover-call-trace
-	var opt_discover_call_trace = new OptionBool("Trace calls of the first invocation of a method", "--discover-call-trace")
+	var opt_discover_call_trace = new OptionBool("Trace calls of the first invocation of methods", "--discover-call-trace")
 
 	redef init
 	do
@@ -157,7 +157,7 @@ class NaiveInterpreter
 			n.debug("inconsitance: no value and not escaping.")
 		end
 		var implicit_cast_to = n.implicit_cast_to
-		if implicit_cast_to != null then
+		if i != null and implicit_cast_to != null then
 			var mtype = self.unanchor_type(implicit_cast_to)
 			if not self.is_subtype(i.mtype, mtype) then n.fatal(self, "Cast failed. Expected `{implicit_cast_to}`, got `{i.mtype}`")
 		end
@@ -343,7 +343,7 @@ class NaiveInterpreter
 	fun string_instance(txt: String): Instance
 	do
 		var nat = native_string_instance(txt)
-		var res = self.send(self.force_get_primitive_method("to_s_with_length", nat.mtype), [nat, self.int_instance(txt.bytelen)])
+		var res = self.send(self.force_get_primitive_method("to_s_full", nat.mtype), [nat, self.int_instance(txt.bytelen), self.int_instance(txt.length)])
 		assert res != null
 		return res
 	end
@@ -471,8 +471,8 @@ class NaiveInterpreter
 				res.add(null_instance)
 				continue
 			end
-			if param.is_vararg and map.vararg_decl > 0 then
-				var vararg = exprs.sub(j, map.vararg_decl)
+			if param.is_vararg and args[i].vararg_decl > 0 then
+				var vararg = exprs.sub(j, args[i].vararg_decl)
 				var elttype = param.mtype.anchor_to(self.mainmodule, recv.mtype.as(MClassType))
 				var arg = self.array_instance(vararg, elttype)
 				res.add(arg)
@@ -526,10 +526,12 @@ class NaiveInterpreter
 	# Execute type checks of covariant parameters
 	fun parameter_check(node: ANode, mpropdef: MMethodDef, args: Array[Instance])
 	do
-		var msignature = mpropdef.msignature
+		var msignature = mpropdef.msignature.as(not null)
 		for i in [0..msignature.arity[ do
+			var mp = msignature.mparameters[i]
+
 			# skip test for vararg since the array is instantiated with the correct polymorphic type
-			if msignature.vararg_rank == i then continue
+			if mp.is_vararg then continue
 
 			# skip if the cast is not required
 			var origmtype =  mpropdef.mproperty.intro.msignature.mparameters[i].mtype
@@ -538,7 +540,7 @@ class NaiveInterpreter
 			#print "{mpropdef}: {mpropdef.mproperty.intro.msignature.mparameters[i]}"
 
 			# get the parameter type
-			var mtype = msignature.mparameters[i].mtype
+			var mtype = mp.mtype
 			var anchor = args.first.mtype.as(MClassType)
 			var amtype = mtype.anchor_to(self.mainmodule, anchor)
 			if not args[i+1].mtype.is_subtype(self.mainmodule, anchor, amtype) then
@@ -566,6 +568,7 @@ class NaiveInterpreter
 	# Use this method, instead of `send` to execute and control the additional behavior of the call-sites
 	fun callsite(callsite: nullable CallSite, arguments: Array[Instance]): nullable Instance
 	do
+		if callsite == null then return null
 		var initializers = callsite.mpropdef.initializers
 		if not initializers.is_empty then
 			var recv = arguments.first
@@ -972,8 +975,6 @@ redef class AMethPropdef
 				return v.bool_instance(recvval >= args[1].to_i)
 			else if pname == "<=>" then
 				return v.int_instance(recvval <=> args[1].to_i)
-			else if pname == "ascii" then
-				return v.char_instance(recvval.ascii)
 			else if pname == "to_f" then
 				return v.float_instance(recvval.to_f)
 			else if pname == "to_b" then
@@ -1045,9 +1046,7 @@ redef class AMethPropdef
 			end
 		else if cname == "Char" then
 			var recv = args[0].val.as(Char)
-			if pname == "ascii" then
-				return v.int_instance(recv.ascii)
-			else if pname == "successor" then
+			if pname == "successor" then
 				return v.char_instance(recv.successor(args[1].to_i))
 			else if pname == "predecessor" then
 				return v.char_instance(recv.predecessor(args[1].to_i))
@@ -1154,8 +1153,8 @@ redef class AMethPropdef
 			else if pname == "atoi" then
 				return v.int_instance(recvval.atoi)
 			else if pname == "fast_cstring" then
-				var ns = recvval.to_s.substring_from(args[1].to_i)
-				return v.native_string_instance(ns)
+				var ns = recvval.fast_cstring(args[1].to_i)
+				return v.native_string_instance(ns.to_s)
 			end
 		else if pname == "calloc_string" then
 			return v.native_string_instance_len(args[1].to_i)
@@ -1761,37 +1760,47 @@ end
 redef class AForExpr
 	redef fun stmt(v)
 	do
-		var col = v.expr(self.n_expr)
-		if col == null then return
-		if col.mtype isa MNullType then fatal(v, "Receiver is null")
+		var iters = new Array[Instance]
+
+		for g in n_groups do
+			var col = v.expr(g.n_expr)
+			if col == null then return
+			if col.mtype isa MNullType then fatal(v, "Receiver is null")
+
+			var iter = v.callsite(g.method_iterator, [col]).as(not null)
+			iters.add iter
+		end
 
-		#self.debug("col {col}")
-		var iter = v.callsite(method_iterator, [col]).as(not null)
-		#self.debug("iter {iter}")
 		loop
-			var isok = v.callsite(method_is_ok, [iter]).as(not null)
-			if not isok.is_true then break
-			if self.variables.length == 1 then
-				var item = v.callsite(method_item, [iter]).as(not null)
-				#self.debug("item {item}")
-				v.write_variable(self.variables.first, item)
-			else if self.variables.length == 2 then
-				var key = v.callsite(method_key, [iter]).as(not null)
-				v.write_variable(self.variables[0], key)
-				var item = v.callsite(method_item, [iter]).as(not null)
-				v.write_variable(self.variables[1], item)
-			else
-				abort
+			for g in n_groups, iter in iters do
+				var isok = v.callsite(g.method_is_ok, [iter]).as(not null)
+				if not isok.is_true then break label
+				if g.variables.length == 1 then
+					var item = v.callsite(g.method_item, [iter]).as(not null)
+					#self.debug("item {item}")
+					v.write_variable(g.variables.first, item)
+				else if g.variables.length == 2 then
+					var key = v.callsite(g.method_key, [iter]).as(not null)
+					v.write_variable(g.variables[0], key)
+					var item = v.callsite(g.method_item, [iter]).as(not null)
+					v.write_variable(g.variables[1], item)
+				else
+					abort
+				end
 			end
 			v.stmt(self.n_block)
 			if v.is_escape(self.break_mark) then break
 			v.is_escape(self.continue_mark) # Clear the break
 			if v.is_escaping then break
-			v.callsite(method_next, [iter])
-		end
-		var method_finish = self.method_finish
-		if method_finish != null then
-			v.callsite(method_finish, [iter])
+			for g in n_groups, iter in iters do
+				v.callsite(g.method_next, [iter])
+			end
+		end label
+		for g in n_groups, iter in iters do
+			var method_finish = g.method_finish
+			if method_finish != null then
+				v.callsite(method_finish, [iter])
+			end
 		end
 	end
 end