Skip to content

Commit ba49dac

Browse files
ono-maxko1
authored andcommitted
Remove redundant "begin" block
1 parent 703bb63 commit ba49dac

File tree

3 files changed

+41
-47
lines changed

3 files changed

+41
-47
lines changed

lib/debug/server_dap.rb

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,27 @@ class RetryBecauseCantRead < Exception
119119
end
120120

121121
def recv_request
122-
begin
123-
r = IO.select([@sock])
124-
125-
@session.process_group.sync do
126-
raise RetryBecauseCantRead unless IO.select([@sock], nil, nil, 0)
127-
128-
case header = @sock.gets
129-
when /Content-Length: (\d+)/
130-
b = @sock.read(2)
131-
raise b.inspect unless b == "\r\n"
132-
133-
l = @sock.read(s = $1.to_i)
134-
show_protocol :>, l
135-
JSON.load(l)
136-
when nil
137-
nil
138-
else
139-
raise "unrecognized line: #{l} (#{l.size} bytes)"
140-
end
122+
r = IO.select([@sock])
123+
124+
@session.process_group.sync do
125+
raise RetryBecauseCantRead unless IO.select([@sock], nil, nil, 0)
126+
127+
case header = @sock.gets
128+
when /Content-Length: (\d+)/
129+
b = @sock.read(2)
130+
raise b.inspect unless b == "\r\n"
131+
132+
l = @sock.read(s = $1.to_i)
133+
show_protocol :>, l
134+
JSON.load(l)
135+
when nil
136+
nil
137+
else
138+
raise "unrecognized line: #{l} (#{l.size} bytes)"
141139
end
142-
rescue RetryBecauseCantRead
143-
retry
144140
end
141+
rescue RetryBecauseCantRead
142+
retry
145143
end
146144

147145
def process

lib/debug/source_repository.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ def all_iseq iseq, rs = []
4040
end
4141

4242
private def add_path path
43-
begin
44-
src = File.read(path)
45-
src = src.gsub("\r\n", "\n") # CRLF -> LF
46-
@files[path] = SrcInfo.new(src.lines)
47-
rescue SystemCallError
48-
end
43+
src = File.read(path)
44+
src = src.gsub("\r\n", "\n") # CRLF -> LF
45+
@files[path] = SrcInfo.new(src.lines)
46+
rescue SystemCallError
4947
end
5048

5149
private def get_si iseq

lib/debug/thread_client.rb

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -341,32 +341,30 @@ def instance_eval_for_cmethod frame_self, src
341341
end
342342

343343
def frame_eval src, re_raise: false
344-
begin
345-
@success_last_eval = false
344+
@success_last_eval = false
346345

347-
b = current_frame&.eval_binding || TOPLEVEL_BINDING
346+
b = current_frame&.eval_binding || TOPLEVEL_BINDING
348347

349-
result = if b
350-
f, _l = b.source_location
351-
b.eval(src, "(rdbg)/#{f}")
352-
else
353-
frame_self = current_frame.self
354-
instance_eval_for_cmethod(frame_self, src)
355-
end
356-
@success_last_eval = true
357-
result
348+
result = if b
349+
f, _l = b.source_location
350+
b.eval(src, "(rdbg)/#{f}")
351+
else
352+
frame_self = current_frame.self
353+
instance_eval_for_cmethod(frame_self, src)
354+
end
355+
@success_last_eval = true
356+
result
358357

359-
rescue Exception => e
360-
return yield(e) if block_given?
358+
rescue Exception => e
359+
return yield(e) if block_given?
361360

362-
puts "eval error: #{e}"
361+
puts "eval error: #{e}"
363362

364-
e.backtrace_locations&.each do |loc|
365-
break if loc.path == __FILE__
366-
puts " #{loc}"
367-
end
368-
raise if re_raise
363+
e.backtrace_locations&.each do |loc|
364+
break if loc.path == __FILE__
365+
puts " #{loc}"
369366
end
367+
raise if re_raise
370368
end
371369

372370
def show_src(frame_index: @current_frame_index,

0 commit comments

Comments
 (0)