parser: `Visitor::visit` does not accepts `null`

[nit.git] / src / naive_interpreter.nit

diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index 90f8483..2ebc4cb 100644 (file)
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -57,12 +57,12 @@ redef class ModelBuilder
                var mainobj = new MutableInstance(sys_type)
                interpreter.mainobj = mainobj
                interpreter.init_instance(mainobj)
-               var initprop = mainmodule.try_get_primitive_method("init", sys_type)
+               var initprop = mainmodule.try_get_primitive_method("init", sys_type.mclass)
                if initprop != null then
                        interpreter.send(initprop, [mainobj])
                end
                interpreter.check_init_instance(mainobj)
-               var mainprop = mainmodule.try_get_primitive_method("main", sys_type)
+               var mainprop = mainmodule.try_get_primitive_method("main", sys_type.mclass)
                if mainprop != null then
                        interpreter.send(mainprop, [mainobj])
                end
@@ -102,7 +102,8 @@ private class NaiveInterpreter
 
        fun force_get_primitive_method(name: String, recv: MType): MMethod
        do
-               return self.modelbuilder.force_get_primitive_method(self.frame.current_node, name, recv, self.mainmodule)
+               assert recv isa MClassType
+               return self.modelbuilder.force_get_primitive_method(self.frame.current_node, name, recv.mclass, self.mainmodule)
        end
 
        # Is a return executed?
@@ -466,7 +467,6 @@ private class NaiveInterpreter
 
        # Check that non nullable attributes of `recv' are correctly initialized.
        # This function is used as the last instruction of a new
-       # FIXME: this will work better once there is nullable types
        fun check_init_instance(recv: Instance)
        do
                if not recv isa MutableInstance then return
@@ -835,6 +835,11 @@ redef class AInternMethPropdef
                        mtype = mtype.arguments.first
                        var val = new Array[Instance].filled_with(v.null_instance, args[1].to_i)
                        return new PrimitiveInstance[Array[Instance]](v.mainmodule.get_primitive_class("NativeArray").get_mtype([mtype]), val)
+               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)
                end
                fatal(v, "NOT YET IMPLEMENTED intern {mpropdef}")
                abort
@@ -1001,8 +1006,7 @@ redef class AAttrPropdef
                        return
                end
                var mtype = self.mpropdef.static_mtype.as(not null)
-               # TODO The needinit info is statically computed, move it to modelbuilder or whatever
-               mtype = mtype.resolve_for(self.mpropdef.mclassdef.bound_mtype, self.mpropdef.mclassdef.bound_mtype, self.mpropdef.mclassdef.mmodule, true)
+               mtype = mtype.anchor_to(v.mainmodule, recv.mtype.as(MClassType))
                if mtype isa MNullableType then
                        recv.attributes[self.mpropdef.mproperty] = v.null_instance
                end
@@ -1065,6 +1069,17 @@ redef class AExpr
 end
 
 redef class ABlockExpr
+       redef fun expr(v)
+       do
+               var last = self.n_expr.last
+               for e in self.n_expr do
+                       if e == last then break
+                       v.stmt(e)
+                       if v.is_escaping then return null
+               end
+               return last.expr(v)
+       end
+
        redef fun stmt(v)
        do
                for e in self.n_expr do
@@ -1586,7 +1601,6 @@ redef class ASuperExpr
 
                # stantard call-next-method
                var mpropdef = v.frame.mpropdef
-               # FIXME: we do not want an ugly static call!
                mpropdef = mpropdef.lookup_next_definition(v.mainmodule, recv.mtype)
                assert mpropdef isa MMethodDef
                var res = v.call(mpropdef, args)