diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-09 01:36:49 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-09 01:36:49 +0000 |
commit | 8e5af8b628b2a52d203e43ad5a8b18375f801cde (patch) | |
tree | 457d72a0f7ac4ea97949ec5b317b359a7d776089 /lib/irb/cmd/load.rb | |
parent | 45592f4b4c7e835881538e52172932c3e20d0c4d (diff) |
* lib/cmath.rb: fixed indent.
* lib/drb/ssl.rb: ditto.
* lib/irb/**/*.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb/cmd/load.rb')
-rw-r--r-- | lib/irb/cmd/load.rb | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb index 6c9e9f67ce..1b6dee6918 100644 --- a/lib/irb/cmd/load.rb +++ b/lib/irb/cmd/load.rb @@ -19,8 +19,8 @@ module IRB include IrbLoader def execute(file_name, priv = nil) -# return ruby_load(file_name) unless IRB.conf[:USE_LOADER] - return irb_load(file_name, priv) + # return ruby_load(file_name) unless IRB.conf[:USE_LOADER] + return irb_load(file_name, priv) end end @@ -28,38 +28,38 @@ module IRB include IrbLoader def execute(file_name) -# return ruby_require(file_name) unless IRB.conf[:USE_LOADER] + # return ruby_require(file_name) unless IRB.conf[:USE_LOADER] - rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?") - return false if $".find{|f| f =~ rex} + rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?") + return false if $".find{|f| f =~ rex} - case file_name - when /\.rb$/ - begin - if irb_load(file_name) - $".push file_name - return true - end - rescue LoadError - end - when /\.(so|o|sl)$/ - return ruby_require(file_name) - end + case file_name + when /\.rb$/ + begin + if irb_load(file_name) + $".push file_name + return true + end + rescue LoadError + end + when /\.(so|o|sl)$/ + return ruby_require(file_name) + end - begin - irb_load(f = file_name + ".rb") - $".push f - return true - rescue LoadError - return ruby_require(file_name) - end + begin + irb_load(f = file_name + ".rb") + $".push f + return true + rescue LoadError + return ruby_require(file_name) + end end end class Source<Nop include IrbLoader def execute(file_name) - source_file(file_name) + source_file(file_name) end end end |