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

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 6c899bd..799c413 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -21,7 +21,6 @@ import literal
 import semantize
 private import parser::tables
 import mixin
-import primitive_types
 private import model::serialize_model
 private import frontend::explain_assert_api
 
@@ -326,7 +325,7 @@ class NaiveInterpreter
 	do
 		var instance = c_string_instance_len(txt.byte_length+1)
 		var val = instance.val
-		val[txt.byte_length] = 0u8
+		val[txt.byte_length] = 0
 		txt.to_cstring.copy_to(val, txt.byte_length, 0, 0)
 
 		return instance
@@ -342,6 +341,18 @@ class NaiveInterpreter
 		return instance
 	end
 
+	# Return a new C string instance sharing the same data space as `txt`
+	fun c_string_instance_fast_cstr(txt: CString, from: Int): Instance
+	do
+		var ncstr = txt.fast_cstring(from)
+		var t = mainmodule.c_string_type
+
+		var instance = new PrimitiveInstance[CString](t, ncstr)
+		init_instance_primitive(instance)
+
+		return instance
+	end
+
 	# Return a new C string initialized of `length`
 	fun c_string_instance_len(length: Int): PrimitiveInstance[CString]
 	do
@@ -826,7 +837,7 @@ class InterpreterFrame
 	super Frame
 
 	# Mapping between a variable and the current value
-	private var map: Map[Variable, Instance] = new HashMap[Variable, Instance]
+	var map: Map[Variable, Instance] = new HashMap[Variable, Instance]
 end
 
 redef class ANode
@@ -875,7 +886,10 @@ redef class AMethPropdef
 		return res
 	end
 
-	private fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame): nullable Instance
+	# Execution of the body of the method
+	#
+	# It handle the common special cases: super, intern, extern
+	fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame): nullable Instance
 	do
 		v.frames.unshift(f)
 
@@ -1175,10 +1189,10 @@ redef class AMethPropdef
 			var recvval = args.first.val.as(CString)
 			if pname == "[]" then
 				var arg1 = args[1].to_i
-				return v.byte_instance(recvval[arg1])
+				return v.int_instance(recvval[arg1])
 			else if pname == "[]=" then
 				var arg1 = args[1].to_i
-				recvval[arg1] = args[2].val.as(Byte)
+				recvval[arg1] = args[2].val.as(Int)
 				return null
 			else if pname == "copy_to" then
 				# sig= copy_to(dest: CString, length: Int, from: Int, to: Int)
@@ -1191,8 +1205,7 @@ redef class AMethPropdef
 			else if pname == "atoi" then
 				return v.int_instance(recvval.atoi)
 			else if pname == "fast_cstring" then
-				var ns = recvval.fast_cstring(args[1].to_i)
-				return v.c_string_instance(ns.to_s)
+				return v.c_string_instance_fast_cstr(args[0].val.as(CString), args[1].to_i)
 			else if pname == "fetch_4_chars" then
 				return v.uint32_instance(args[0].val.as(CString).fetch_4_chars(args[1].to_i))
 			else if pname == "fetch_4_hchars" then
@@ -1700,6 +1713,8 @@ redef class AEscapeExpr
 			var i = v.expr(ne)
 			if i == null then return
 			v.escapevalue = i
+		else
+			v.escapevalue = null
 		end
 		v.escapemark = self.escapemark
 	end
@@ -1976,8 +1991,9 @@ end
 redef class ACharExpr
 	redef fun expr(v)
 	do
-		if is_ascii then return v.byte_instance(self.value.as(not null).ascii)
-		if is_code_point then return v.int_instance(self.value.as(not null).code_point)
+		if is_code_point then
+			return v.int_instance(self.value.as(not null).code_point)
+		end
 		return v.char_instance(self.value.as(not null))
 	end
 end