diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 11:12:04 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 11:12:04 +0000 |
commit | e7d267c42a13ca83c8c2ca1718e0fd92a83957ed (patch) | |
tree | 7c18697fe792a478dc9462a65951b07ff1abdd6d | |
parent | 688ca71c13c46ef7df022845266eb4549b98f38c (diff) | |
download | ruby-e7d267c42a13ca83c8c2ca1718e0fd92a83957ed.tar.gz |
* ext/iconv/charset_alias.rb: pass block argument to outer local
variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/iconv/charset_alias.rb | 3 | ||||
-rw-r--r-- | ext/iconv/mkwrapper.rb | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Feb 3 20:10:52 2010 Tanaka Akira <akr@fsij.org> + + * ext/iconv/charset_alias.rb: pass block argument to outer local + variable. + Wed Feb 3 20:08:05 2010 Tanaka Akira <akr@fsij.org> * file.c (realpath_rec): rb_path_last_separator may return NULL. diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb index d4ed9139c8..e0a0a82c39 100644 --- a/ext/iconv/charset_alias.rb +++ b/ext/iconv/charset_alias.rb @@ -95,7 +95,8 @@ end target = OS opt = nil -ARGV.options do |opt| +ARGV.options do |opt2| + opt = opt2 opt.banner << " config.status map.rb" opt.on("--target OS") {|t| target = t} opt.parse! and (1..2) === ARGV.size diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb index 34718507d6..6438e57fec 100644 --- a/ext/iconv/mkwrapper.rb +++ b/ext/iconv/mkwrapper.rb @@ -43,9 +43,9 @@ def charset_alias(config_charset, mapfile = nil) end src << " end" << "end" if mapfile - open(mapfile, "wb") {|f| f.puts *src} + open(mapfile, "wb") {|f| f.puts(*src)} else - puts *src + puts(*src) end end |