Merge branch 'killnitc' old branch renamed as 'oldnitc'

[nit.git] / src / debugger.nit

diff --git a/src/debugger.nit b/src/debugger.nit
index 274c8e4..ae1ac5a 100644 (file)
--- a/src/debugger.nit
+++ b/src/debugger.nit
@@ -19,6 +19,7 @@ module debugger
 
 import breakpoint
 intrude import naive_interpreter
+import nitx
 
 redef class ToolContext
        # -d
@@ -35,8 +36,8 @@ redef class ToolContext
 end
 
 redef class ModelBuilder
-       # Execute the program from the entry point (Sys::main) of the `mainmodule'
-       # `arguments' are the command-line arguments in order
+       # Execute the program from the entry point (Sys::main) of the `mainmodule`
+       # `arguments` are the command-line arguments in order
        # REQUIRE that:
        #   1. the AST is fully loaded.
        #   2. the model is fully built.
@@ -69,7 +70,7 @@ redef class ModelBuilder
        end
 end
 
-# The class extending NaiveInterpreter by adding debugging methods
+# The class extending `NaiveInterpreter` by adding debugging methods
 class Debugger
        super NaiveInterpreter
 
@@ -272,6 +273,10 @@ class Debugger
                # Step-over command
                else if command == "n" then
                        return step_over
+               # Opens a new NitIndex prompt on current model
+               else if command == "nitx" then
+                       new NitIndex.with_infos(modelbuilder, self.mainmodule).prompt
+                       return true
                # Continues execution until the end
                else if command == "c" then
                        return continue_exec
@@ -371,6 +376,8 @@ class Debugger
                        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].has('[') and parts_of_command[1].has(']') then
                        process_array_command(parts_of_command)
                else
@@ -525,6 +532,7 @@ class Debugger
 
        # Effectively untraces the variable called *variable_name*
        #
+       # Returns true if the variable exists, false otherwise
        private fun untrace_variable(variable_name: String): Bool
        do
                var to_remove: nullable TraceObject = null
@@ -710,6 +718,8 @@ 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}"
@@ -720,6 +730,8 @@ class Debugger
                else
                        print "Found variable {instance}"
                end
+
+               print "Stopping printing innards of a variable"
        end
 
        # Prints the attributes demanded in a SequenceRead
@@ -1153,6 +1165,7 @@ class Debugger
                print "[p/print] variable : [p/print] * shows the status of all the variables\n"
                print "[p/print] variable[i] : Prints the value of the variable contained at position *i* in SequenceRead collection *variable*\n"
                print "[p/print] variable[i..j]: Prints the value of all the variables contained between positions *i* and *j* in SequenceRead collection *variable*\n"
+               print "[p/print] stack: Prints a stack trace at current instruction\n"
                print "Note : The arrays can be multi-dimensional (Ex : variable[i..j][k] will print all the values at position *k* of all the SequenceRead collections contained between positions *i* and *j* in SequenceRead collection *variable*)\n"
                print "s : steps in on the current function\n"
                print "n : steps-over the current instruction\n"