* 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

1 files changed, 27 insertions, 5 deletions

diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index fc8d476eae..c4142a924e 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -8,6 +8,9 @@
 #
 #   
 #
+require 'irb/src_encoding'
+require 'irb/magic-file'
+
 module IRB
   # 
   # InputMethod
@@ -41,15 +44,19 @@ module IRB
       super
       @line_no = 0
       @line = []
+      @stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+      @stdout = IO.open(STDOUT.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
     end
 
     def gets
       print @prompt
-      @line[@line_no += 1] = $stdin.gets
+      line = @stdin.gets
+      p line.encoding
+      @line[@line_no += 1] = line
     end
 
     def eof?
-      $stdin.eof?
+      @stdin.eof?
     end
 
     def readable_atfer_eof?
@@ -59,12 +66,16 @@ module IRB
     def line(line_no)
       @line[line_no]
     end
+
+    def encoding
+      @stdin.external_encoding
+    end
   end
   
   class FileInputMethod < InputMethod
     def initialize(file)
       super
-      @io = open(file)
+      @io = IRB::MagicFile.open(file)
     end
     attr_reader :file_name
 
@@ -78,6 +89,10 @@ module IRB
 #      print @prompt, l
       l
     end
+
+    def encoding
+      @io.external_encoding
+    end
   end
 
   begin
@@ -90,11 +105,14 @@ module IRB
 	@line_no = 0
 	@line = []
 	@eof = false
+
+	@stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+	@stdout = IO.open(STDOUT.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
       end
 
       def gets
-        Readline.input = STDIN
-        Readline.output = STDOUT
+        Readline.input = @stdin
+        Readline.output = @stdout
 	if l = readline(@prompt, false)
 	  HISTORY.push(l) if !l.empty?
 	  @line[@line_no += 1] = l + "\n"
@@ -115,6 +133,10 @@ module IRB
       def line(line_no)
 	@line[line_no]
       end
+
+      def encoding
+	@stdin.external_encoding
+      end
     end
   rescue LoadError
   end