src: use `ASuperExpr::mpropdef` instead of asking the frame or visitors

[nit.git] / src / naive_interpreter.nit

diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index 956f2bc..afa3fd9 100644 (file)
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -347,9 +347,7 @@ private class NaiveInterpreter
                        self.discover_call_trace.add mpropdef
                        self.debug("Discovered {mpropdef}")
                end
-               if args.length < mpropdef.msignature.arity + 1 or args.length > mpropdef.msignature.arity + 1 then
-                       fatal("NOT YET IMPLEMENTED: Invalid arity for {mpropdef}. {args.length} arguments given.")
-               end
+               assert args.length == mpropdef.msignature.arity + 1 else debug("Invalid arity for {mpropdef}. {args.length} arguments given.")
 
                # Look for the AST node that implements the property
                var mproperty = mpropdef.mproperty
@@ -404,6 +402,13 @@ private class NaiveInterpreter
                return null
        end
 
+       # Execute a full `callsite` for given `args`
+       # Use this method, instead of `send` to execute and control the aditionnal behavior of the call-sites
+       fun callsite(callsite: nullable CallSite, arguments: Array[Instance]): nullable Instance
+       do
+               return send(callsite.mproperty, arguments)
+       end
+
        # Execute `mproperty` for a `args` (where `args[0]` is the receiver).
        # Return a falue if `mproperty` is a function, or null if it is a procedure.
        # The call is polimotphic. There is a message-seding/late-bindng according to te receiver (args[0]).
@@ -618,10 +623,10 @@ redef class AConcreteMethPropdef
                        var args = [arguments.first]
                        for auto_super_init in auto_super_inits do
                                args.clear
-                               for i in [0..auto_super_init.intro.msignature.arity+1[ do
+                               for i in [0..auto_super_init.msignature.arity+1[ do
                                        args.add(arguments[i])
                                end
-                               v.send(auto_super_init, args)
+                               v.callsite(auto_super_init, args)
                        end
                end
 
@@ -711,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
@@ -924,6 +933,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)
@@ -1104,7 +1121,7 @@ redef class AVarReassignExpr
                var vari = v.frame.map[self.variable.as(not null)]
                var value = v.expr(self.n_value)
                if value == null then return
-               var res = v.send(reassign_callsite.mproperty, [vari, value])
+               var res = v.callsite(reassign_callsite, [vari, value])
                assert res != null
                v.frame.map[self.variable.as(not null)] = res
        end
@@ -1521,7 +1538,7 @@ redef class ASendExpr
                        args.add(i)
                end
 
-               var res = v.send(callsite.mproperty, args)
+               var res = v.callsite(callsite, args)
                return res
        end
 end
@@ -1540,15 +1557,15 @@ redef class ASendReassignFormExpr
                var value = v.expr(self.n_value)
                if value == null then return
 
-               var read = v.send(callsite.mproperty, args)
+               var read = v.callsite(callsite, args)
                assert read != null
 
-               var write = v.send(reassign_callsite.mproperty, [read, value])
+               var write = v.callsite(reassign_callsite, [read, value])
                assert write != null
 
                args.add(write)
 
-               v.send(write_callsite.mproperty, args)
+               v.callsite(write_callsite, args)
        end
 end
 
@@ -1572,7 +1589,7 @@ redef class ASuperExpr
                                end
                        end
                        # Super init call
-                       var res = v.send(callsite.mproperty, args)
+                       var res = v.callsite(callsite, args)
                        return res
                end
 
@@ -1581,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
@@ -1601,7 +1617,7 @@ redef class ANewExpr
                        if i == null then return null
                        args.add(i)
                end
-               var res2 = v.send(callsite.mproperty, args)
+               var res2 = v.callsite(callsite, args)
                if res2 != null then
                        #self.debug("got {res2} from {mproperty}. drop {recv}")
                        return res2
@@ -1645,7 +1661,7 @@ redef class AAttrReassignExpr
                if value == null then return
                var mproperty = self.mproperty.as(not null)
                var attr = v.read_attribute(mproperty, recv)
-               var res = v.send(reassign_callsite.mproperty, [attr, value])
+               var res = v.callsite(reassign_callsite, [attr, value])
                assert res != null
                assert recv isa MutableInstance
                recv.attributes[mproperty] = res