* lib/csv.rb: enable frozen_string_literal.
[fix GH-1116] Patch by @marshall-lee git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4a7dedf7f0
commit
aed0db8bd3
@ -1,3 +1,8 @@
|
|||||||
|
Wed Dec 2 11:23:06 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/csv.rb: enable frozen_string_literal.
|
||||||
|
[fix GH-1116] Patch by @marshall-lee
|
||||||
|
|
||||||
Wed Dec 2 10:36:25 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
Wed Dec 2 10:36:25 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
* ext/bigdecimal/bigdecimal.c: Fix double word typo.
|
* ext/bigdecimal/bigdecimal.c: Fix double word typo.
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
# encoding: US-ASCII
|
# encoding: US-ASCII
|
||||||
# = csv.rb -- CSV Reading and Writing
|
# = csv.rb -- CSV Reading and Writing
|
||||||
#
|
#
|
||||||
@ -207,7 +208,7 @@ require "stringio"
|
|||||||
#
|
#
|
||||||
class CSV
|
class CSV
|
||||||
# The version of the installed library.
|
# The version of the installed library.
|
||||||
VERSION = "2.4.8".freeze
|
VERSION = "2.4.8"
|
||||||
|
|
||||||
#
|
#
|
||||||
# A CSV::Row is part Array and part Hash. It retains an order for the fields
|
# A CSV::Row is part Array and part Hash. It retains an order for the fields
|
||||||
@ -1153,7 +1154,7 @@ class CSV
|
|||||||
args.unshift(io)
|
args.unshift(io)
|
||||||
else
|
else
|
||||||
encoding = args[-1][:encoding] if args.last.is_a?(Hash)
|
encoding = args[-1][:encoding] if args.last.is_a?(Hash)
|
||||||
str = ""
|
str = String.new
|
||||||
str.force_encoding(encoding) if encoding
|
str.force_encoding(encoding) if encoding
|
||||||
args.unshift(str)
|
args.unshift(str)
|
||||||
end
|
end
|
||||||
@ -1178,7 +1179,7 @@ class CSV
|
|||||||
def self.generate_line(row, options = Hash.new)
|
def self.generate_line(row, options = Hash.new)
|
||||||
options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
|
options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
|
||||||
encoding = options.delete(:encoding)
|
encoding = options.delete(:encoding)
|
||||||
str = ""
|
str = String.new
|
||||||
if encoding
|
if encoding
|
||||||
str.force_encoding(encoding)
|
str.force_encoding(encoding)
|
||||||
elsif field = row.find { |f| not f.nil? }
|
elsif field = row.find { |f| not f.nil? }
|
||||||
@ -1527,7 +1528,7 @@ class CSV
|
|||||||
# prepare for building safe regular expressions in the target encoding,
|
# prepare for building safe regular expressions in the target encoding,
|
||||||
# if we can transcode the needed characters
|
# if we can transcode the needed characters
|
||||||
#
|
#
|
||||||
@re_esc = "\\".encode(@encoding) rescue ""
|
@re_esc = "\\".encode(@encoding).freeze rescue ""
|
||||||
@re_chars = /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/
|
@re_chars = /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/
|
||||||
|
|
||||||
init_separators(options)
|
init_separators(options)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user