Skip to content

Commit 952c2e8

Browse files
committed
Merge branch 'master' of github.com:ruby-debug/ruby-debug-ide
2 parents e0fa3ce + 9ff8728 commit 952c2e8

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

lib/ruby-debug-ide/command.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,8 @@ def debug_silent_eval(str)
136136
end
137137
end
138138

139-
def hbinding(hash)
140-
code = hash.keys.map{|k| "#{k} = hash['#{k}']"}.join(';') + ';binding'
141-
if obj = @state.context.frame_self(@state.frame_pos)
142-
obj.instance_eval code
143-
else
144-
eval code
145-
end
146-
end
147-
private :hbinding
148-
149139
def get_binding
150-
binding = @state.context.frame_binding(@state.frame_pos)
151-
binding || hbinding(@state.context.frame_locals(@state.frame_pos))
140+
@state.context.frame_binding(@state.frame_pos)
152141
end
153142

154143
def line_at(file, line)

lib/ruby-debug-ide/commands/variables.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ def execute
8686
# instance variables
8787
kind = 'instance'
8888
inst_vars = obj.instance_variables
89-
instance_binding = obj.instance_eval{binding()}
89+
instance_binding = obj.instance_eval{::Kernel.binding()}
9090
# print self at top position
9191
print_variable('self', debug_eval('self', instance_binding), kind) if inst_vars.include?('self')
9292
inst_vars.sort.each do |var|
9393
print_variable(var, debug_eval(var, instance_binding), kind) unless var == 'self'
9494
end
9595

9696
# class variables
97-
class_binding = obj.class.class_eval('binding()')
97+
class_binding = obj.class.class_eval('::Kernel.binding()')
9898
obj.class.class_variables.sort.each do |var|
9999
print_variable(var, debug_eval(var, class_binding), 'class')
100100
end

0 commit comments

Comments
 (0)