interpreter: Fix, removed a useless condition in call.

[nit.git] / src / naive_interpreter.nit

diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index f7b97ba..9a25fa9 100644 (file)
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -716,6 +716,10 @@ redef class AInternMethPropdef
                                return v.char_instance(recv.succ)
                        else if pname == "prec" then
                                return v.char_instance(recv.prec)
+                       else if pname == "+" then
+                               return v.char_instance(recv + args[1].to_i)
+                       else if pname == "-" then
+                               return v.char_instance(recv - args[1].to_i)
                        else if pname == "<" then
                                return v.bool_instance(recv < args[1].val.as(Char))
                        else if pname == ">" then
@@ -865,12 +869,14 @@ redef class AExternMethPropdef
                                return v.int_instance(res)
                        else if pname == "native_int_to_s" then
                                return v.native_string_instance(recvval.to_s)
+                       else if pname == "strerror_ext" then
+                               return v.native_string_instance(recvval.strerror)
                        end
                else if cname == "NativeFile" then
                        var recvval = args.first.val
                        if pname == "io_write" then
                                var a1 = args[1].val.as(Buffer)
-                               recvval.as(OStream).write(a1.substring(0, args[2].to_i))
+                               recvval.as(OStream).write(a1.substring(0, args[2].to_i).to_s)
                                return args[2]
                        else if pname == "io_read" then
                                var str = recvval.as(IStream).read(args[2].to_i)
@@ -902,10 +908,6 @@ redef class AExternMethPropdef
                        else if pname == "atof" then
                                return v.float_instance(recvval.to_f)
                        end
-               else if cname == "Int" then
-                       if pname == "rand" then
-                               return v.int_instance(args[0].to_i.rand)
-                       end
                else if cname == "Float" then
                        if pname == "cos" then
                                return v.float_instance(args[0].to_f.cos)
@@ -929,6 +931,14 @@ redef class AExternMethPropdef
                                return v.float_instance(args[0].to_f.pow(args[1].to_f))
                        else if pname == "rand" then
                                return v.float_instance(args[0].to_f.rand)
+                       else if pname == "abs" then
+                               return v.float_instance(args[0].to_f.abs)
+                       else if pname == "hypot_with" then
+                               return v.float_instance(args[0].to_f.hypot_with(args[1].to_f))
+                       else if pname == "is_nan" then
+                               return v.bool_instance(args[0].to_f.is_nan)
+                       else if pname == "is_inf_extern" then
+                               return v.bool_instance(args[0].to_f.is_inf != 0)
                        end
                else if pname == "native_argc" then
                        return v.int_instance(v.arguments.length)
@@ -954,6 +964,8 @@ redef class AExternMethPropdef
                        return v.int_instance(parser_action(args[1].to_i, args[2].to_i))
                else if pname == "file_getcwd" then
                        return v.native_string_instance(getcwd)
+               else if pname == "errno" then
+                       return v.int_instance(sys.errno)
                end
                fatal(v, "NOT YET IMPLEMENTED extern {mpropdef}")
                abort
@@ -1249,19 +1261,19 @@ redef class AForExpr
                if col.mtype isa MNullType then fatal(v, "Receiver is null")
 
                #self.debug("col {col}")
-               var iter = v.send(v.force_get_primitive_method("iterator", col.mtype), [col]).as(not null)
+               var iter = v.callsite(method_iterator, [col]).as(not null)
                #self.debug("iter {iter}")
                loop
-                       var isok = v.send(v.force_get_primitive_method("is_ok", iter.mtype), [iter]).as(not null)
+                       var isok = v.callsite(method_is_ok, [iter]).as(not null)
                        if not isok.is_true then return
                        if self.variables.length == 1 then
-                               var item = v.send(v.force_get_primitive_method("item", iter.mtype), [iter]).as(not null)
+                               var item = v.callsite(method_item, [iter]).as(not null)
                                #self.debug("item {item}")
                                v.frame.map[self.variables.first] = item
                        else if self.variables.length == 2 then
-                               var key = v.send(v.force_get_primitive_method("key", iter.mtype), [iter]).as(not null)
+                               var key = v.callsite(method_key, [iter]).as(not null)
                                v.frame.map[self.variables[0]] = key
-                               var item = v.send(v.force_get_primitive_method("item", iter.mtype), [iter]).as(not null)
+                               var item = v.callsite(method_item, [iter]).as(not null)
                                v.frame.map[self.variables[1]] = item
                        else
                                abort
@@ -1270,7 +1282,7 @@ redef class AForExpr
                        if v.is_break(self.escapemark) then return
                        v.is_continue(self.escapemark) # Clear the break
                        if v.is_escaping then return
-                       v.send(v.force_get_primitive_method("next", iter.mtype), [iter])
+                       v.callsite(method_next, [iter])
                end
        end
 end
@@ -1415,7 +1427,7 @@ redef class ACrangeExpr
                var mtype = v.unanchor_type(self.mtype.as(not null))
                var res = new MutableInstance(mtype)
                v.init_instance(res)
-               v.send(v.force_get_primitive_method("init", mtype), [res, e1, e2])
+               v.callsite(init_callsite, [res, e1, e2])
                return res
        end
 end
@@ -1430,7 +1442,7 @@ redef class AOrangeExpr
                var mtype = v.unanchor_type(self.mtype.as(not null))
                var res = new MutableInstance(mtype)
                v.init_instance(res)
-               v.send(v.force_get_primitive_method("without_last", mtype), [res, e1, e2])
+               v.callsite(init_callsite, [res, e1, e2])
                return res
        end
 end
@@ -1586,9 +1598,8 @@ redef class ASuperExpr
                end
 
                # stantard call-next-method
-               var mpropdef = v.frame.mpropdef
+               var mpropdef = self.mpropdef
                mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype)
-               assert mpropdef isa MMethodDef
                var res = v.call_without_varargs(mpropdef, args)
                return res
        end