From 61bd5fb4dcf56d9660d95c893703fcca698d42e9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 Oct 2005 14:33:30 +0000 Subject: * ext/iconv/charset_alias.rb (charset_alias): create wrapper libray even if no target matched. * ext/iconv/extconf.rb: create wrapper library under RUBYARCHDIR directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/iconv/charset_alias.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/iconv/charset_alias.rb') diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb index f3a54b8ddc..aed4644290 100644 --- a/ext/iconv/charset_alias.rb +++ b/ext/iconv/charset_alias.rb @@ -1,4 +1,5 @@ #! /usr/bin/ruby +# :stopdoc: require 'rbconfig' require 'optparse' @@ -27,13 +28,12 @@ end def charset_alias(config_charset, mapfile, target = OS) map = Hash::Ordered.new comments = [] - match = false open(config_charset) do |input| - input.find {|line| /^case "\$os" in/ =~ line} or return + input.find {|line| /^case "\$os" in/ =~ line} or break input.find {|line| /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)} - } or return + } or break input.find do |line| case line when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/ @@ -50,7 +50,7 @@ def charset_alias(config_charset, mapfile, target = OS) end case target when /linux|-gnu/ -# map.delete('ascii') + # map.delete('ascii') when /cygwin|os2-emx/ # get rid of tilde/yen problem. map['shift_jis'] = 'cp932' -- cgit v1.2.3