зеркало из https://github.com/github/ruby.git
* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
swapped. [ruby-core:4772] (patch from speakillof) * lib/rexml/encoding.rb: fixed indentation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
0214d35d79
Коммит
64c156e073
|
@ -1,3 +1,8 @@
|
|||
Mon Apr 25 13:54:55 2005 speakillof <speakillof@yahoo.co.jp>
|
||||
|
||||
* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
|
||||
swapped. [ruby-core:4772]
|
||||
|
||||
Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org>
|
||||
|
||||
* oniguruma.h (OnigWarnFunc): add a variadic argument.
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
# -*- mode: ruby; ruby-indent-level: 2; indent-tabs-mode: t; tab-width: 2 -*- vim: sw=2 ts=2
|
||||
module REXML
|
||||
module Encoding
|
||||
@encoding_methods = {}
|
||||
def self.register(enc, &block)
|
||||
@encoding_methods[enc] = block
|
||||
end
|
||||
def self.apply(obj, enc)
|
||||
@encoding_methods[enc][obj]
|
||||
end
|
||||
def self.encoding_method(enc)
|
||||
@encoding_methods[enc]
|
||||
end
|
||||
@encoding_methods = {}
|
||||
def self.register(enc, &block)
|
||||
@encoding_methods[enc] = block
|
||||
end
|
||||
def self.apply(obj, enc)
|
||||
@encoding_methods[enc][obj]
|
||||
end
|
||||
def self.encoding_method(enc)
|
||||
@encoding_methods[enc]
|
||||
end
|
||||
|
||||
# Native, default format is UTF-8, so it is declared here rather than in
|
||||
# an encodings/ definition.
|
||||
|
@ -28,24 +28,24 @@ module REXML
|
|||
if enc and enc != UTF_8
|
||||
@encoding = enc.upcase
|
||||
begin
|
||||
require 'rexml/encodings/ICONV.rb'
|
||||
Encoding.apply(self, "ICONV")
|
||||
require 'rexml/encodings/ICONV.rb'
|
||||
Encoding.apply(self, "ICONV")
|
||||
rescue LoadError, Exception => err
|
||||
raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
|
||||
raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
|
||||
@encoding.untaint
|
||||
enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
|
||||
begin
|
||||
require enc_file
|
||||
Encoding.apply(self, @encoding)
|
||||
require enc_file
|
||||
Encoding.apply(self, @encoding)
|
||||
rescue LoadError
|
||||
puts $!.message
|
||||
raise ArgumentError, "No decoder found for encoding #@encoding. Please install iconv."
|
||||
puts $!.message
|
||||
raise ArgumentError, "No decoder found for encoding #@encoding. Please install iconv."
|
||||
end
|
||||
end
|
||||
else
|
||||
@encoding = UTF_8
|
||||
require 'rexml/encodings/UTF-8.rb'
|
||||
Encoding.apply(self, @encoding)
|
||||
@encoding = UTF_8
|
||||
require 'rexml/encodings/UTF-8.rb'
|
||||
Encoding.apply(self, @encoding)
|
||||
end
|
||||
ensure
|
||||
$VERBOSE = old_verbosity
|
||||
|
|
|
@ -3,11 +3,11 @@ require 'uconv'
|
|||
module REXML
|
||||
module Encoding
|
||||
def decode_sjis content
|
||||
Uconv::u8tosjis(content)
|
||||
Uconv::sjistou8(content)
|
||||
end
|
||||
|
||||
def encode_sjis(str)
|
||||
Uconv::sjistou8(str)
|
||||
Uconv::u8tosjis(str)
|
||||
end
|
||||
|
||||
b = proc do |obj|
|
||||
|
|
Загрузка…
Ссылка в новой задаче