debugger: Removed network versions of debugger, now handled via options

[nit.git] / src / debugger.nit

diff --git a/src/debugger.nit b/src/debugger.nit
index a73bab5..cd77425 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
+import websocket
 
 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
 
@@ -123,11 +124,23 @@ redef class ToolContext
        # -c
        var opt_debugger_autorun: OptionBool = new OptionBool("Launches the target program with the interpreter, such as when the program fails, the debugging prompt is summoned", "-c")
 
+       # --socket
+       var opt_socket_mode = new OptionBool("Launches the target program with raw output on the network via sockets", "--socket")
+
+       # --websocket
+       var opt_websocket_mode = new OptionBool("Launches the target program with output on the network via websockets", "--websocket")
+
+       # --port
+       var opt_debug_port: OptionInt = new OptionInt("Sets the debug port (Defaults to 22125) - Must be contained between 0 and 65535", 22125, "--port")
+
        redef init
        do
                super
                self.option_context.add_option(self.opt_debugger_mode)
                self.option_context.add_option(self.opt_debugger_autorun)
+               self.option_context.add_option(self.opt_socket_mode)
+               self.option_context.add_option(self.opt_websocket_mode)
+               self.option_context.add_option(self.opt_debug_port)
        end
 end
 
@@ -145,8 +158,12 @@ redef class ModelBuilder
 
                var interpreter = new Debugger(self, mainmodule, arguments)
 
+               set_stdstreams
+
                init_naive_interpreter(interpreter, mainmodule)
 
+               close_stdstreams
+
                var time1 = get_time
                self.toolcontext.info("*** END INTERPRETING: {time1-time0} ***", 2)
        end
@@ -159,11 +176,53 @@ redef class ModelBuilder
                var interpreter = new Debugger(self, mainmodule, arguments)
                interpreter.autocontinue = true
 
+               set_stdstreams
+
                init_naive_interpreter(interpreter, mainmodule)
 
+               close_stdstreams
+
                var time1 = get_time
                self.toolcontext.info("*** END INTERPRETING: {time1-time0} ***", 2)
        end
+
+       redef fun run_naive_interpreter(mmod, args)
+       do
+               set_stdstreams
+               super
+       end
+
+       fun set_stdstreams
+       do
+               if self.toolcontext.opt_socket_mode.value then
+                       var sock = new Socket.server(toolcontext.opt_debug_port.value, 1)
+                       var ns = sock.accept
+                       sock.close
+                       sys.set_io(ns,ns,ns)
+               else if self.toolcontext.opt_websocket_mode.value then
+                       var websock = new WebSocket(toolcontext.opt_debug_port.value, 1)
+                       websock.accept
+                       sys.set_io(websock,websock,websock)
+               end
+       end
+
+       fun close_stdstreams
+       do
+               if sys.stdin isa WebSocket or sys.stdin isa Socket then
+                       sys.stdin.close
+                       sys.stdout.close
+                       sys.stderr.close
+               end
+       end
+end
+
+redef class Sys
+       private fun set_io(istream: PollableIStream, ostream: OStream, errstream: OStream)
+       do
+               self.stdin = istream
+               self.stdout = ostream
+               self.stderr = ostream
+       end
 end
 
 # The class extending `NaiveInterpreter` by adding debugging methods
@@ -223,6 +282,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)
@@ -301,8 +362,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
@@ -639,7 +704,7 @@ class Debugger
        # Processes an array print command
        fun process_array_command(parts_of_command: Array[String])
        do
-               var index_of_first_brace = parts_of_command[1].index_of('[')
+               var index_of_first_brace = parts_of_command[1].chars.index_of('[')
                var variable_name = get_real_variable_name(parts_of_command[1].substring(0,index_of_first_brace))
                var braces = parts_of_command[1].substring_from(index_of_first_brace)
 
@@ -1095,8 +1160,8 @@ class Debugger
        # Returns an array containing all the indexes demanded
        fun process_index(index_string: String): nullable Array[Int]
        do
-               var from_end_index = index_string.index_of('.')
-               var to_start_index = index_string.last_index_of('.')
+               var from_end_index = index_string.chars.index_of('.')
+               var to_start_index = index_string.chars.last_index_of('.')
 
                if from_end_index != -1 and to_start_index != -1 then
                        var index_from_string = index_string.substring(0,from_end_index)