mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/irb/init.rb (IRB.opt_parse): (M17N) adds -U and -E as command
line options. [ruby-dev:37161]. Fixes #711. improved long optinos. * lib/irb/init.rb (IRB.set_encoding): new subroutine for IRB.opt_parse * lib/irb/input-method.rb (IRB::StdioInputMethod): (M17N) regards scripts that user types as encoded in the external_encoding. * lib/irb/input-method.rb (IRB::ReadlineInputMethod): ditto. * lib/irb/input-method.rb (IRB::FileInputMethod): (M17N) respects magic comment. * lib/irb/help.rb (IRB.print_usage): (M17N) respects magic comment in the resource file. * lib/irb/lc/help-message: adds -U and -E. * lib/irb/lc/ja/help-message: ditto. re-encoded from ISO-2022-JP into UTF-8. * lib/irb/lc/ja/encoding_aliases.rb: new file. provides Japanese specific character encoding name table for backward compatibility. * lib/irb/lc/ja/error.rb: re-eoncoded from ISO-2022-JP into UTF-8. magic comment. * lib/irb/locale.rb: integrated with Ruby 1.9's M17N support. * lib/irb/magic-file.rb: new file. utility to handle files with magic comment and opens in the correct encoding. * lib/irb/ruby-lex.rb (RubyLex#each_top_level_statement): recovers character encoding for a statement after it lexed so that irb can eval the statement in correct encoding. * lib/irb/src_encoding.rb: new file. utility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
52d481d8de
commit
5c1bd53c92
12 changed files with 271 additions and 107 deletions
36
lib/irb/magic-file.rb
Normal file
36
lib/irb/magic-file.rb
Normal file
|
@ -0,0 +1,36 @@
|
|||
module IRB
|
||||
class << (MagicFile = Object.new)
|
||||
# see parser_magic_comment in parse.y
|
||||
ENCODING_SPEC_RE = %r"coding\s*[=:]\s*([[:alnum:]\-_]+)"
|
||||
|
||||
def open(path)
|
||||
io = File.open(path, 'rb')
|
||||
line = io.gets
|
||||
line = io.gets if line[0,2] == "#!"
|
||||
encoding = detect_encoding(line)
|
||||
encoding ||= default_src_encoding
|
||||
io.rewind
|
||||
io.set_encoding(encoding, nil)
|
||||
|
||||
if block_given?
|
||||
begin
|
||||
return (yield io)
|
||||
ensure
|
||||
io.close
|
||||
end
|
||||
else
|
||||
return io
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def detect_encoding(line)
|
||||
return unless line[0] == ?#
|
||||
line = line[1..-1]
|
||||
line = $1 if line[/-\*-\s*(.*?)\s*-*-$/]
|
||||
return nil unless ENCODING_SPEC_RE =~ line
|
||||
encoding = $1
|
||||
return encoding.sub(/-(?:mac|dos|unix)/i, '')
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue