stdlib/strings: Factorized several functions in Text.
[nit.git] / src / naive_interpreter.nit
index 956f2bc..537573c 100644 (file)
@@ -249,7 +249,7 @@ private class NaiveInterpreter
        # Return a new native string initialized with `txt`
        fun native_string_instance(txt: String): Instance
        do
-               var val = new Buffer.from(txt)
+               var val = new FlatBuffer.from(txt)
                val.add('\0')
                var ic = self.mainmodule.get_primitive_class("NativeString")
                return new PrimitiveInstance[Buffer](ic.mclass_type, val)
@@ -264,7 +264,7 @@ private class NaiveInterpreter
        # Return a stack stace. One line per function
        fun stack_trace: String
        do
-               var b = new Buffer
+               var b = new FlatBuffer
                b.append(",---- Stack trace -- - -  -\n")
                for f in frames do
                        b.append("| {f.mpropdef} ({f.current_node.location})\n")
@@ -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
 
@@ -762,7 +767,7 @@ redef class AInternMethPropdef
                                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(Buffer)
+                               var destval = args[1].val.as(FlatBuffer)
                                var lenval = args[2].to_i
                                var fromval = args[3].to_i
                                var toval = args[4].to_i
@@ -778,7 +783,7 @@ redef class AInternMethPropdef
                                if toval + lenval >= destval.length then
                                        debug("Illegal access on {destval} for element {toval}+{lenval}/{destval.length}")
                                end
-                               recvval.copy(fromval, lenval, destval, toval)
+                               recvval.as(FlatBuffer).copy(fromval, lenval, destval, toval)
                                return null
                        else if pname == "atoi" then
                                return v.int_instance(recvval.to_i)
@@ -865,12 +870,12 @@ redef class AExternMethPropdef
                        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)
                                var a1 = args[1].val.as(Buffer)
-                               new Buffer.from(str).copy(0, str.length, a1, 0)
+                               new FlatBuffer.from(str).copy(0, str.length, a1.as(FlatBuffer), 0)
                                return v.int_instance(str.length)
                        else if pname == "io_close" then
                                recvval.as(IOS).close
@@ -1104,7 +1109,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 +1526,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 +1545,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 +1577,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
 
@@ -1601,7 +1606,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 +1650,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