mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (ruby_init): set ruby_running to true after
initialization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
06f82d3883
commit
46bf621737
6 changed files with 31 additions and 14 deletions
|
@ -18,11 +18,11 @@ rescue LoadError
|
|||
module REXML
|
||||
module Encoding
|
||||
def from_euc_jp(str)
|
||||
return Iconv::iconv("utf-8", "euc-jp", str).join
|
||||
return Iconv::iconv("utf-8", "euc-jp", str).join('')
|
||||
end
|
||||
|
||||
def to_euc_jp content
|
||||
return Iconv::iconv("euc-jp", "utf-8", content).join
|
||||
return Iconv::iconv("euc-jp", "utf-8", content).join('')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,5 +13,21 @@ begin
|
|||
end
|
||||
end
|
||||
rescue LoadError
|
||||
raise "uconv is required for Japanese encoding support."
|
||||
begin
|
||||
require 'iconv'
|
||||
module REXML
|
||||
module Encoding
|
||||
def from_shift_jis(str)
|
||||
return Iconv::iconv("utf-8", "shift_jis", str).join('')
|
||||
end
|
||||
|
||||
def to_shift_jis content
|
||||
return Iconv::iconv("shift_jis", "utf-8", content).join('')
|
||||
end
|
||||
end
|
||||
end
|
||||
rescue LoadError
|
||||
raise "uconv or iconv is required for Japanese encoding support."
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue