debug 1.4.0 → 1.9.2

data/lib/debug/source_repository.rb

@@ -4,72 +4,145 @@ require_relative 'color'
 
 module DEBUGGER__
   class SourceRepository
-    SrcInfo = Struct.new(:src, :colored)
+    include Color
 
-    def initialize
-      @files = {} # filename => SrcInfo
+    def file_src iseq
+      if (path = (iseq.absolute_path || iseq.path)) && File.exist?(path)
+        File.readlines(path, chomp: true)
+      end
     end
 
-    def add iseq, src
-      if (path = iseq.absolute_path) && File.exist?(path)
-        add_path path
-      elsif src
-        add_iseq iseq, src
+    def get iseq
+      return unless iseq
+
+      if CONFIG[:show_evaledsrc]
+        orig_src(iseq) || file_src(iseq)
+      else
+        file_src(iseq) || orig_src(iseq)
       end
     end
 
-    def all_iseq iseq, rs = []
-      rs << iseq
-      iseq.each_child{|ci|
-        all_iseq(ci, rs)
-      }
-      rs
-    end
+    if defined?(RubyVM.keep_script_lines)
+      # Ruby 3.1 and later
+      RubyVM.keep_script_lines = true
+      require 'objspace'
 
-    private def add_iseq iseq, src
-      line = iseq.first_line
-      if line > 1
-        src = ("\n" * (line - 1)) + src
+      def initialize
+        # cache
+        @cmap = ObjectSpace::WeakMap.new
+        @loaded_file_map = {} # path => nil
       end
-      si = SrcInfo.new(src.lines)
 
-      all_iseq(iseq).each{|e|
-        e.instance_variable_set(:@debugger_si, si)
-        e.freeze
-      }
-    end
+      def add iseq, src
+        # only manage loaded file names
+        if (path = (iseq.absolute_path || iseq.path)) && File.exist?(path)
+          if @loaded_file_map.has_key? path
+            return path, true # reloaded
+          else
+            @loaded_file_map[path] = path
+            return path, false
+          end
+        end
+      end
 
-    private def add_path path
-      src = File.read(path)
-      src = src.gsub("\r\n", "\n") # CRLF -> LF
-      @files[path] = SrcInfo.new(src.lines)
-    rescue SystemCallError
-    end
+      def orig_src iseq
+        lines = iseq.script_lines&.map(&:chomp)
+        line = iseq.first_line
+        if line > 1
+          [*([''] * (line - 1)), *lines]
+        else
+          lines
+        end
+      end
 
-    private def get_si iseq
-      return unless iseq
+      def get_colored iseq
+        if lines = @cmap[iseq]
+          lines
+        else
+          if src_lines = get(iseq)
+            @cmap[iseq] = colorize_code(src_lines.join("\n")).lines
+          else
+            nil
+          end
+        end
+      end
+    else
+      # ruby 3.0 or earlier
+      SrcInfo = Struct.new(:src, :colored)
 
-      if iseq.instance_variable_defined?(:@debugger_si)
-        iseq.instance_variable_get(:@debugger_si)
-      elsif @files.has_key?(path = iseq.absolute_path)
-        @files[path]
-      elsif path
-        add_path(path)
+      def initialize
+        @files = {} # filename => SrcInfo
       end
-    end
 
-    def get iseq
-      if si = get_si(iseq)
-        si.src
+      def add iseq, src
+        path = (iseq.absolute_path || iseq.path)
+
+        if path && File.exist?(path)
+          reloaded = @files.has_key? path
+
+          if src
+            add_iseq iseq, src
+            return path, reloaded
+          else
+            add_path path
+            return path, reloaded
+          end
+        else
+          add_iseq iseq, src
+          nil
+        end
       end
-    end
 
-    include Color
+      private def all_iseq iseq, rs = []
+        rs << iseq
+        iseq.each_child{|ci|
+          all_iseq(ci, rs)
+        }
+        rs
+      end
+
+      private def add_iseq iseq, src
+        line = iseq.first_line
+        if line > 1
+          src = ("\n" * (line - 1)) + src
+        end
+
+        si = SrcInfo.new(src.each_line.map{|l| l.chomp})
+        all_iseq(iseq).each{|e|
+          e.instance_variable_set(:@debugger_si, si)
+          e.freeze
+        }
+      end
+
+      private def add_path path
+        src_lines = File.readlines(path, chomp: true)
+        @files[path] = SrcInfo.new(src_lines)
+      rescue SystemCallError
+      end
+
+      private def get_si iseq
+        return unless iseq
+
+        if iseq.instance_variable_defined?(:@debugger_si)
+          iseq.instance_variable_get(:@debugger_si)
+        elsif @files.has_key?(path = (iseq.absolute_path || iseq.path))
+          @files[path]
+        elsif path
+          add_path(path)
+        end
+      end
+
+      def orig_src iseq
+        if si = get_si(iseq)
+          si.src
+        end
+      end
 
-    def get_colored iseq
-      if si = get_si(iseq)
-        si.colored || begin
-          si.colored = colorize_code(si.src.join).lines
+      def get_colored iseq
+        if si = get_si(iseq)
+          si.colored || begin
+            si.colored = colorize_code(si.src.join("\n")).lines
+          end
         end
       end
     end

data/lib/debug/start.rb

@@ -2,4 +2,4 @@
 
 require_relative 'session'
 return unless defined?(DEBUGGER__)
-DEBUGGER__.start
+DEBUGGER__.start no_sigint_hook: false