X-Git-Url: http://nitlanguage.org diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit index c70dc83..c4f7ac3 100644 --- a/src/interpreter/naive_interpreter.nit +++ b/src/interpreter/naive_interpreter.nit @@ -22,6 +22,7 @@ import semantize private import parser::tables import mixin import primitive_types +private import model::serialize_model redef class ToolContext # --discover-call-trace @@ -113,24 +114,16 @@ class NaiveInterpreter return self.modelbuilder.force_get_primitive_method(current_node, name, recv.mclass, self.mainmodule) end - # Is a return executed? - # Set this mark to skip the evaluation until the end of the specified method frame - var returnmark: nullable FRAME = null - - # Is a break or a continue executed? + # Is a return, a break or a continue executed? # Set this mark to skip the evaluation until a labeled statement catch it with `is_escape` var escapemark: nullable EscapeMark = null - # Is an abort being executed ? - # Set this mark to return to the last `catch` bloc or effectively aborting if there isn't any - var catch_mark = new EscapeMark - # The count of `catch` blocs that have been encountered and can catch an abort var catch_count = 0 # Is a return or a break or a continue executed? # Use this function to know if you must skip the evaluation of statements - fun is_escaping: Bool do return returnmark != null or escapemark != null + fun is_escaping: Bool do return escapemark != null # The value associated with the current return/break/continue, if any. # Set the value when you set a escapemark. @@ -324,34 +317,34 @@ class NaiveInterpreter end end - # Return a new native string initialized with `txt` - fun native_string_instance(txt: String): Instance + # Return a new C string initialized with `txt` + fun c_string_instance(txt: String): Instance do - var instance = native_string_instance_len(txt.bytelen+1) + var instance = c_string_instance_len(txt.byte_length+1) var val = instance.val - val[txt.bytelen] = 0u8 - txt.to_cstring.copy_to(val, txt.bytelen, 0, 0) + val[txt.byte_length] = 0u8 + txt.to_cstring.copy_to(val, txt.byte_length, 0, 0) return instance end - # Return a new native string initialized with `txt` - fun native_string_instance_from_ns(txt: NativeString, len: Int): Instance + # Return a new C string initialized with `txt` + fun c_string_instance_from_ns(txt: CString, len: Int): Instance do - var instance = native_string_instance_len(len) + var instance = c_string_instance_len(len) var val = instance.val txt.copy_to(val, len, 0, 0) return instance end - # Return a new native string initialized of `length` - fun native_string_instance_len(length: Int): PrimitiveInstance[NativeString] + # Return a new C string initialized of `length` + fun c_string_instance_len(length: Int): PrimitiveInstance[CString] do - var val = new NativeString(length) + var val = new CString(length) - var t = mainmodule.native_string_type - var instance = new PrimitiveInstance[NativeString](t, val) + var t = mainmodule.c_string_type + var instance = new PrimitiveInstance[CString](t, val) init_instance_primitive(instance) return instance end @@ -359,8 +352,8 @@ class NaiveInterpreter # Return a new String instance for `txt` fun string_instance(txt: String): Instance do - var nat = native_string_instance(txt) - 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)]) + var nat = c_string_instance(txt) + var res = self.send(self.force_get_primitive_method("to_s_full", nat.mtype), [nat, self.int_instance(txt.byte_length), self.int_instance(txt.length)]) assert res != null return res end @@ -855,10 +848,8 @@ redef class AMethPropdef var f = v.new_frame(self, mpropdef, args) var res = call_commons(v, mpropdef, args, f) v.frames.shift - if v.returnmark == f then - v.returnmark = null + if v.is_escape(self.return_mark) then res = v.escapevalue - v.escapevalue = null return res end return res @@ -950,7 +941,7 @@ redef class AMethPropdef else if pname == "native_class_name" then var recv = args.first var txt = recv.mtype.to_s - return v.native_string_instance(txt) + return v.c_string_instance(txt) else if pname == "==" then # == is correctly redefined for instances return v.bool_instance(args[0] == args[1]) @@ -960,6 +951,8 @@ redef class AMethPropdef return v.bool_instance(args[0].mtype == args[1].mtype) else if pname == "is_same_instance" then return v.bool_instance(args[0].eq_is(args[1])) + else if pname == "class_inheritance_metamodel_json" then + return v.c_string_instance(v.mainmodule.flatten_mclass_hierarchy.to_thin_json) else if pname == "exit" then exit(args[1].to_i) abort @@ -1155,11 +1148,11 @@ redef class AMethPropdef else if pname == "round" then return v.float_instance(args[0].to_f.round) end - else if cname == "NativeString" then + else if cname == "CString" then if pname == "new" then - return v.native_string_instance_len(args[1].to_i) + return v.c_string_instance_len(args[1].to_i) end - var recvval = args.first.val.as(NativeString) + var recvval = args.first.val.as(CString) if pname == "[]" then var arg1 = args[1].to_i return v.byte_instance(recvval[arg1]) @@ -1168,8 +1161,8 @@ redef class AMethPropdef recvval[arg1] = args[2].val.as(Byte) return null else if pname == "copy_to" then - # sig= copy_to(dest: NativeString, length: Int, from: Int, to: Int) - var destval = args[1].val.as(NativeString) + # sig= copy_to(dest: CString, length: Int, from: Int, to: Int) + var destval = args[1].val.as(CString) var lenval = args[2].to_i var fromval = args[3].to_i var toval = args[4].to_i @@ -1179,16 +1172,14 @@ redef class AMethPropdef return v.int_instance(recvval.atoi) else if pname == "fast_cstring" then var ns = recvval.fast_cstring(args[1].to_i) - return v.native_string_instance(ns.to_s) + return v.c_string_instance(ns.to_s) else if pname == "fetch_4_chars" then - return v.int_instance(args[0].val.as(NativeString).fetch_4_chars(args[1].to_i)) + return v.int_instance(args[0].val.as(CString).fetch_4_chars(args[1].to_i)) else if pname == "fetch_4_hchars" then - return v.int_instance(args[0].val.as(NativeString).fetch_4_hchars(args[1].to_i)) + return v.int_instance(args[0].val.as(CString).fetch_4_hchars(args[1].to_i)) else if pname == "utf8_length" then - return v.int_instance(args[0].val.as(NativeString).utf8_length(args[1].to_i, args[2].to_i)) + return v.int_instance(args[0].val.as(CString).utf8_length(args[1].to_i, args[2].to_i)) end - else if pname == "calloc_string" then - return v.native_string_instance_len(args[1].to_i) else if cname == "NativeArray" then if pname == "new" then var val = new Array[Instance].filled_with(v.null_instance, args[1].to_i) @@ -1477,12 +1468,7 @@ redef class AMethPropdef return v.int_instance(v.arguments.length) else if pname == "native_argv" then var txt = v.arguments[args[1].to_i] - return v.native_string_instance(txt) - else if pname == "native_argc" then - return v.int_instance(v.arguments.length) - else if pname == "native_argv" then - var txt = v.arguments[args[1].to_i] - return v.native_string_instance(txt) + return v.c_string_instance(txt) else if pname == "lexer_goto" then return v.int_instance(lexer_goto(args[1].to_i, args[2].to_i)) else if pname == "lexer_accept" then @@ -1524,7 +1510,7 @@ redef class AAttrPropdef # Evaluate and set the default value of the attribute in `recv` private fun init_expr(v: NaiveInterpreter, recv: Instance) do - if is_lazy then return + if is_lazy or is_optional then return if has_value then var f = v.new_frame(self, mreadpropdef.as(not null), [recv]) evaluate_expr(v, recv, f) @@ -1552,10 +1538,9 @@ redef class AAttrPropdef val = v.expr(nexpr) else if nblock != null then v.stmt(nblock) - assert v.returnmark == f + assert v.escapemark == return_mark val = v.escapevalue - v.returnmark = null - v.escapevalue = null + v.escapemark = null else abort end @@ -1700,19 +1685,6 @@ redef class AEscapeExpr end end -redef class AReturnExpr - redef fun stmt(v) - do - var ne = self.n_expr - if ne != null then - var i = v.expr(ne) - if i == null then return - v.escapevalue = i - end - v.returnmark = v.frame - end -end - redef class AAbortExpr redef fun stmt(v) do @@ -1721,8 +1693,7 @@ redef class AAbortExpr fatal(v, "Aborted") exit(1) else - # Abort mode, skipping everything until a `catch` bloc is reached - v.escapemark = v.catch_mark + abort end end end @@ -1767,14 +1738,23 @@ end redef class ADoExpr redef fun stmt(v) do - # If this bloc has a catch, register it in the counter - if self.n_catch != null then v.catch_count += 1 - v.stmt(self.n_block) - v.is_escape(self.break_mark) # Clear the break (if any) + # If this bloc has a catch, handle it with a do ... catch ... end if self.n_catch != null then - v.catch_count -= 1 - # Are we in abort mode? then this catch is executing - if v.is_escape(v.catch_mark) then v.stmt(self.n_catch) + var frame = v.frame + v.catch_count += 1 + do + v.stmt(self.n_block) + v.is_escape(self.break_mark) # Clear the break (if any) + v.catch_count -= 1 + catch + # Restore the current frame if needed + while v.frame != frame do v.frames.shift + v.catch_count -= 1 + v.stmt(self.n_catch) + end + else + v.stmt(self.n_block) + v.is_escape(self.break_mark) end end end @@ -2039,7 +2019,7 @@ redef class AStringExpr var s = v.string_instance(value) if is_string then return s if is_bytestring then - var ns = v.native_string_instance_from_ns(bytes.items, bytes.length) + var ns = v.c_string_instance_from_ns(bytes.items, bytes.length) var ln = v.int_instance(bytes.length) var prop = to_bytes_with_copy assert prop != null