debugger: Handles errors when analyzing semantically a module at runtime (avoids...

[nit.git] / src / debugger.nit

diff --git a/src/debugger.nit b/src/debugger.nit
index 8e17340..b16a797 100644 (file)
--- a/src/debugger.nit
+++ b/src/debugger.nit
@@ -19,8 +19,32 @@ module debugger
 
 import breakpoint
 intrude import naive_interpreter
+import nitx
+intrude import toolcontext
 
 redef class ToolContext
+       private var dbg: nullable Debugger = null
+
+       private var had_error: Bool = false
+
+       redef fun check_errors
+       do
+               if dbg == null then
+                       super
+               else
+                       if messages.length > 0 then
+                               message_sorter.sort(messages)
+
+                               for m in messages do
+                                       if "Warning".search_in(m.text, 0) == null then had_error = true
+                                       stderr.write("{m.to_color_string}\n")
+                               end
+                       end
+
+                       messages.clear
+               end
+       end
+
        # -d
        var opt_debugger_mode: OptionBool = new OptionBool("Launches the target program with the debugger attached to it", "-d")
        # -c
@@ -35,8 +59,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 +93,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
 
@@ -150,16 +174,16 @@ class Debugger
                if self.stop_after_step_over_trigger then
                        if self.frames.length <= self.step_stack_count then
                                n.debug("Execute stmt {n.to_s}")
-                               while process_debug_command(gets) do end
+                               while read_cmd do end
                        end
                else if self.stop_after_step_out_trigger then
                        if frames.length < self.step_stack_count then
                                n.debug("Execute stmt {n.to_s}")
-                               while process_debug_command(gets) do end
+                               while read_cmd do end
                        end
                else if step_in_trigger then
                        n.debug("Execute stmt {n.to_s}")
-                       while process_debug_command(gets) do end
+                       while read_cmd do end
                end
        end
 
@@ -182,7 +206,7 @@ class Debugger
                        end
 
                        n.debug("Execute stmt {n.to_s}")
-                       while process_debug_command(gets) do end
+                       while read_cmd do end
                end
        end
 
@@ -197,7 +221,7 @@ class Debugger
                        for j in self.traces do
                                if j.is_variable_traced_in_frame(i, frame) then
                                        n.debug("Traced variable {i} used")
-                                       if j.break_on_encounter then while process_debug_command(gets) do end
+                                       if j.break_on_encounter then while read_cmd do end
                                        break
                                end
                        end
@@ -249,6 +273,12 @@ class Debugger
        ##                   Processing commands functions                   ##
        #######################################################################
 
+       fun read_cmd: Bool
+       do
+               printn "> "
+               return process_debug_command(gets)
+       end
+
        # Takes a user command as a parameter
        #
        # Returns a boolean value, representing whether or not to
@@ -272,6 +302,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