src: cleanup importations

[nit.git] / src / debugger.nit

diff --git a/src/debugger.nit b/src/debugger.nit
index 08befc6..0f211e6 100644 (file)
--- a/src/debugger.nit
+++ b/src/debugger.nit
@@ -23,6 +23,7 @@ import nitx
 intrude import local_var_init
 intrude import scope
 intrude import toolcontext
+private import parser_util
 
 redef class Model
        # Cleans the model to remove a module and what it defines when semantic analysis fails on injected code
@@ -110,7 +111,7 @@ redef class ToolContext
 
                                for m in messages do
                                        if m.text.search("Warning") == null then had_error = true
-                                       stderr.write("{m.to_color_string}\n")
+                                       sys.stderr.write("{m.to_color_string}\n")
                                end
                        end
 
@@ -223,6 +224,8 @@ class Debugger
                var old = frame.current_node
                frame.current_node = n
 
+               if sys.stdin.poll_in then process_debug_command(gets)
+
                if not self.autocontinue then
                        if not n isa ABlockExpr then
                                steps_fun_call(n)
@@ -278,7 +281,7 @@ class Debugger
                if self.modelbuilder.mpropdef2npropdef.has_key(mpropdef) then
                        var npropdef = self.modelbuilder.mpropdef2npropdef[mpropdef]
                        self.parameter_check(npropdef, mpropdef, args)
-                       if npropdef isa AConcreteMethPropdef then
+                       if npropdef isa AMethPropdef then
                                return npropdef.rt_call(self, mpropdef, args)
                        else
                                print "Error, invalid propdef to call at runtime !"
@@ -301,8 +304,12 @@ class Debugger
                var local_toolctx = modelbuilder.toolcontext
                local_toolctx.dbg = self
                var e = local_toolctx.parse_something(nit_code)
+               if e isa ABlockExpr then
+                       nit_code = "module rt_module\n" + nit_code
+                       e = local_toolctx.parse_something(nit_code)
+               end
                if e isa AExpr then
-                       nit_code = "print " + nit_code
+                       nit_code = "module rt_module\nprint " + nit_code
                        e = local_toolctx.parse_something(nit_code)
                end
                if e isa AModule then
@@ -329,7 +336,8 @@ class Debugger
                                if initprop != null then
                                        self.send(initprop, [mobj])
                                end
-                               var mainprop = mmod.try_get_primitive_method("main", sys_type.mclass)
+                               var mainprop = mmod.try_get_primitive_method("run", sys_type.mclass) or else
+                                       mmod.try_get_primitive_method("main", sys_type.mclass)
                                if mainprop != null then
                                        self.rt_send(mainprop, [mobj])
                                end
@@ -582,13 +590,12 @@ class Debugger
 
                        var keys = map_of_instances.iterator
 
-                       print "Variables collection : \n"
+                       var self_var = seek_variable("self", frame)
+                       print "self: {self_var.to_s}"
 
                        for instance in map_of_instances.keys do
-                               print "Variable {instance.to_s}, Instance {map_of_instances[instance].to_s}"
+                               print "{instance.to_s}: {map_of_instances[instance].to_s}"
                        end
-
-                       print "\nEnd of current instruction \n"
                else if parts_of_command[1] == "stack" then
                        print self.stack_trace
                else if parts_of_command[1].chars.has('[') and parts_of_command[1].chars.has(']') then
@@ -927,20 +934,18 @@ class Debugger
        # If it is a primitive type, its value is directly printed
        fun print_instance(instance: Instance)
        do
-               print "Printing innards of a variable"
-
                if instance isa MutableInstance then
-                       var attributes = instance.attributes
-                       print "Object : {instance}"
+                       print "\{"
+                       print "\ttype : {instance},"
 
-                       for current_attribute in attributes.keys do
-                               print "Attribute : {current_attribute.to_s} \nValeur : {attributes[current_attribute].to_s}"
-                       end
+                       printn("\t")
+
+                       print instance.attributes.join(",\n\t"," : ")
+
+                       print "\}"
                else
-                       print "Found variable {instance}"
+                       print "{instance}"
                end
-
-               print "Stopping printing innards of a variable"
        end
 
        # Prints the attributes demanded in a SequenceRead
@@ -1360,7 +1365,7 @@ class Debugger
 
 end
 
-redef class AConcreteMethPropdef
+redef class AMethPropdef
 
        # Same as call except it will copy local variables of the parent frame to the frame defined in this call.
        # Not supposed to be used by anyone else than the Debugger.