* 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

4 files changed, 51 insertions, 34 deletions

diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index d93951b33d..9c08a5c29d 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -1,3 +1,4 @@
+# -*- coding: US-ASCII -*-
 #
 #   irb/lc/help-message.rb - 
 #   	$Release Version: 0.9.5$
@@ -14,6 +15,8 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -d                Set $DEBUG to true (same as `ruby -d')
   -r load-module    Same as `ruby -r'
   -I path           Specify $LOAD_PATH directory
+  -U                Same as `ruby -U`
+  -E enc            Same as `ruby -E`
   --inspect	    Use `inspect' for output (default except for bc mode)
   --noinspect	    Don't use inspect for output
   --readline	    Use Readline extension module
@@ -32,3 +35,4 @@ Usage:  irb.rb [options] [programfile] [arguments]
 		    value is 16. 
   --irb_debug n	    Set internal debug level to n (not for popular use)
   -v, --version	    Print the version of irb
+# vim:fileencoding=us-ascii
diff --git a/lib/irb/lc/ja/encoding_aliases.rb b/lib/irb/lc/ja/encoding_aliases.rb
new file mode 100644
index 0000000000..a713dff4be
--- /dev/null
+++ b/lib/irb/lc/ja/encoding_aliases.rb
@@ -0,0 +1,8 @@
+module IRB
+  class Locale
+    @@legacy_encoding_alias_map = {
+      'ujis' => Encoding::EUC_JP,
+      'euc' => Encoding::EUC_JP
+    }.freeze
+  end
+end
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 13cf180142..dc0345e6df 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -1,4 +1,4 @@
-#
+# -*- coding: utf-8 -*-
 #   irb/lc/ja/error.rb - 
 #   	$Release Version: 0.9.5$
 #   	$Revision$
@@ -13,14 +13,15 @@ require "e2mmap"
 module IRB
   # exceptions
   extend Exception2MessageMapper
-  def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
-  def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
-  def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
-  def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
-  def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
-  def_exception :IrbSwitchedToCurrentThread, '$B%+%l%s%H%9%l%C%I$K@Z$jBX$o$j$^$7$?(B.'
-  def_exception :NoSuchJob, '$B$=$N$h$&$J%8%g%V(B(%s)$B$O$"$j$^$;$s(B.'
-  def_exception :CantShiftToMultiIrbMode, 'multi-irb mode$B$K0\$l$^$;$s(B.'
-  def_exception :CantChangeBinding, '$B%P%$%s%G%#%s%0(B(%s)$B$KJQ99$G$-$^$;$s(B.'
-  def_exception :UndefinedPromptMode, '$B%W%m%s%W%H%b!<%I(B(%s)$B$ODj5A$5$l$F$$$^$;$s(B.'
+  def_exception :UnrecognizedSwitch, 'スイッチ(%s)が分りません'
+  def_exception :NotImplementedError, '`%s\'の定義が必要です'
+  def_exception :CantReturnToNormalMode, 'Normalモードに戻れません.'
+  def_exception :IllegalParameter, 'パラメータ(%s)が間違っています.'
+  def_exception :IrbAlreadyDead, 'Irbは既に死んでいます.'
+  def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドに切り替わりました.'
+  def_exception :NoSuchJob, 'そのようなジョブ(%s)はありません.'
+  def_exception :CantShiftToMultiIrbMode, 'multi-irb modeに移れません.'
+  def_exception :CantChangeBinding, 'バインディング(%s)に変更できません.'
+  def_exception :UndefinedPromptMode, 'プロンプトモード(%s)は定義されていません.'
 end
+# vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index ff09b073da..d156039c9b 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -1,4 +1,4 @@
-#
+# -*- coding: utf-8 -*-
 #   irb/lc/ja/help-message.rb - 
 #   	$Release Version: 0.9.5$
 #   	$Revision$
@@ -9,27 +9,31 @@
 #   
 #
 Usage:  irb.rb [options] [programfile] [arguments]
-  -f		    ~/.irbrc $B$rFI$_9~$^$J$$(B.
-  -m		    bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B)
-  -d                $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B)
-  -r load-module    ruby -r $B$HF1$8(B.
-  -I path           $LOAD_PATH $B$K(B path $B$rDI2C$9$k(B.
-  --inspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B). 
-  --noinspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B.
-  --readline	    readline$B%i%$%V%i%j$rMxMQ$9$k(B.
-  --noreadline	    readline$B%i%$%V%i%j$rMxMQ$7$J$$(B. 
+  -f		    ~/.irbrc を読み込まない.
+  -m		    bcモード(分数, 行列の計算ができる)
+  -d                $DEBUG をtrueにする(ruby -d と同じ)
+  -r load-module    ruby -r と同じ.
+  -I path           $LOAD_PATH に path を追加する.
+  -U                ruby -U と同じ.
+  -E enc            ruby -E と同じ.
+  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト). 
+  --noinspect	    結果出力にinspectを用いない.
+  --readline	    readlineライブラリを利用する.
+  --noreadline	    readlineライブラリを利用しない. 
   --prompt prompt-mode/--prompt-mode prompt-mode
-		    $B%W%m%s%W%H%b!<%I$r@ZBX$($^$9(B. $B8=:_Dj5A$5$l$F$$$k%W(B
-		    $B%m%s%W%H%b!<%I$O(B, default, simple, xmp, inf-ruby$B$,(B
-		    $BMQ0U$5$l$F$$$^$9(B. 
-  --inf-ruby-mode   emacs$B$N(Binf-ruby-mode$BMQ$N%W%m%s%W%HI=<($r9T$J$&(B. $BFC(B
-		    $B$K;XDj$,$J$$8B$j(B, readline$B%i%$%V%i%j$O;H$o$J$/$J$k(B.
-  --simple-prompt   $BHs>o$K%7%s%W%k$J%W%m%s%W%H$rMQ$$$k%b!<%I$G$9(B.
-  --noprompt	    $B%W%m%s%W%HI=<($r9T$J$o$J$$(B.
-  --tracer	    $B%3%^%s%I<B9T;~$K%H%l!<%9$r9T$J$&(B.
+		    プロンプトモードを切替えます. 現在定義されているプ
+		    ロンプトモードは, default, simple, xmp, inf-rubyが
+		    用意されています. 
+  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
+		    に指定がない限り, readlineライブラリは使わなくなる.
+  --simple-prompt   非常にシンプルなプロンプトを用いるモードです.
+  --noprompt	    プロンプト表示を行なわない.
+  --tracer	    コマンド実行時にトレースを行なう.
   --back-trace-limit n
-		    $B%P%C%/%H%l!<%9I=<($r%P%C%/%H%l!<%9$NF,$+$i(B n, $B8e$m(B
-		    $B$+$i(Bn$B$@$19T$J$&(B. $B%G%U%)%k%H$O(B16 
-  --irb_debug n	    irb$B$N%G%P%C%0%G%P%C%0%l%Y%k$r(Bn$B$K@_Dj$9$k(B($BMxMQ$7$J(B
-		    $B$$J}$,L5Fq$G$7$g$&(B).
-  -v, --version	    irb$B$N%P!<%8%g%s$rI=<($9$k(B
+		    バックトレース表示をバックトレースの頭から n, 後ろ
+		    からnだけ行なう. デフォルトは16 
+  --irb_debug n	    irbのデバッグデバッグレベルをnに設定する(利用しな
+		    い方が無難でしょう).
+  -v, --version	    irbのバージョンを表示する
+
+# vim:fileencoding=utf-8