diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-16 22:09:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-16 22:09:29 +0000 |
| commit | 4d2f38b7778cd51cdf1e877d61dbb1ad2b028557 (patch) | |
| tree | 37b44b95a3fbe5055110e7ac4853cf48df351234 /lib/irb/locale.rb | |
| parent | e84ce31a9e6e82bc1980ac34eb2b8f246caf77c0 (diff) | |
| download | ruby-4d2f38b7778cd51cdf1e877d61dbb1ad2b028557.tar.gz | |
* ext/readline/readline.c: suppress warnings.
* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
ditto.
* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
* lib/irb/locale.rb (IRB::Locale::real_load): ditto.
* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb/locale.rb')
| -rw-r--r-- | lib/irb/locale.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index b2c90e38e2..351406c2da 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -10,7 +10,6 @@ # # -autoload :Tempfile, "tempfile" autoload :Kconv, "kconv" module IRB @@ -126,15 +125,12 @@ module IRB end def real_load(path, priv) - tmp_base = path.tr("./:", "___") - lc_file = Tempfile.new(tmp_base) - File.foreach(path) do |line| - line = self.String(line) - lc_file.print(line) + src = self.String(File.read(path)) + if priv + eval("self", TOPLEVEL_BINDING).extend(Module.new {eval(src, nil, path)}) + else + eval(src, TOPLEVEL_BINDING, path) end - lc_file.close - toplevel_load lc_file.path, priv - lc_file.close(true) end private :real_load |