diff options
| -rw-r--r-- | lib/irb/cmd/nop.rb | 12 | ||||
| -rw-r--r-- | lib/irb/ext/loader.rb | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb index fc6231f0a7..7fb197c51f 100644 --- a/lib/irb/cmd/nop.rb +++ b/lib/irb/cmd/nop.rb @@ -30,23 +30,19 @@ module IRB end end - def self.execute(conf, *opts, **kwargs, &block) - command = new(conf) + def self.execute(irb_context, *opts, **kwargs, &block) + command = new(irb_context) command.execute(*opts, **kwargs, &block) rescue CommandArgumentError => e puts e.message end - def initialize(conf) - @irb_context = conf + def initialize(irb_context) + @irb_context = irb_context end attr_reader :irb_context - def irb - @irb_context.irb - end - def execute(*opts) #nop end diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb index 1ab8a4e322..d65695df3b 100644 --- a/lib/irb/ext/loader.rb +++ b/lib/irb/ext/loader.rb @@ -42,6 +42,7 @@ module IRB # :nodoc: # # See Irb#suspend_input_method for more information. def source_file(path) + irb = irb_context.irb irb.suspend_name(path, File.basename(path)) do FileInputMethod.open(path) do |io| irb.suspend_input_method(io) do @@ -66,6 +67,7 @@ module IRB # :nodoc: # # See Irb#suspend_input_method for more information. def load_file(path, priv = nil) + irb = irb_context.irb irb.suspend_name(path, File.basename(path)) do if priv |