hsbt	2016-07-14 12:48:54 +0900 (Thu, 14 Jul 2016)

  New Revision: 55671

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55671

  Log:
    * ext/json/**/*.rb: merge original files from upstream repository.
      It only fixes styles of frozen string literal.

  Modified files:
    trunk/ChangeLog
    trunk/ext/json/extconf.rb
    trunk/ext/json/generator/extconf.rb
    trunk/ext/json/lib/json/add/bigdecimal.rb
    trunk/ext/json/lib/json/add/complex.rb
    trunk/ext/json/lib/json/add/core.rb
    trunk/ext/json/lib/json/add/date.rb
    trunk/ext/json/lib/json/add/date_time.rb
    trunk/ext/json/lib/json/add/exception.rb
    trunk/ext/json/lib/json/add/ostruct.rb
    trunk/ext/json/lib/json/add/range.rb
    trunk/ext/json/lib/json/add/rational.rb
    trunk/ext/json/lib/json/add/regexp.rb
    trunk/ext/json/lib/json/add/struct.rb
    trunk/ext/json/lib/json/add/symbol.rb
    trunk/ext/json/lib/json/add/time.rb
    trunk/ext/json/lib/json/common.rb
    trunk/ext/json/lib/json/ext/.keep
    trunk/ext/json/lib/json/ext.rb
    trunk/ext/json/lib/json/generic_object.rb
    trunk/ext/json/lib/json.rb
Index: ext/json/generator/extconf.rb
===================================================================
--- ext/json/generator/extconf.rb	(revision 55670)
+++ ext/json/generator/extconf.rb	(revision 55671)
@@ -1,4 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/generator/extconf.rb#L1
-# frozen_string_literal: false
 require 'mkmf'
 
 $defs << "-DJSON_GENERATOR"
Index: ext/json/lib/json/add/regexp.rb
===================================================================
--- ext/json/lib/json/add/regexp.rb	(revision 55670)
+++ ext/json/lib/json/add/regexp.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/regexp.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/date_time.rb
===================================================================
--- ext/json/lib/json/add/date_time.rb	(revision 55670)
+++ ext/json/lib/json/add/date_time.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/date_time.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/range.rb
===================================================================
--- ext/json/lib/json/add/range.rb	(revision 55670)
+++ ext/json/lib/json/add/range.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/range.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/date.rb
===================================================================
--- ext/json/lib/json/add/date.rb	(revision 55670)
+++ ext/json/lib/json/add/date.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/date.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/exception.rb
===================================================================
--- ext/json/lib/json/add/exception.rb	(revision 55670)
+++ ext/json/lib/json/add/exception.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/exception.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/time.rb
===================================================================
--- ext/json/lib/json/add/time.rb	(revision 55670)
+++ ext/json/lib/json/add/time.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/time.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/bigdecimal.rb
===================================================================
--- ext/json/lib/json/add/bigdecimal.rb	(revision 55670)
+++ ext/json/lib/json/add/bigdecimal.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/bigdecimal.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/ostruct.rb
===================================================================
--- ext/json/lib/json/add/ostruct.rb	(revision 55670)
+++ ext/json/lib/json/add/ostruct.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/ostruct.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/struct.rb
===================================================================
--- ext/json/lib/json/add/struct.rb	(revision 55670)
+++ ext/json/lib/json/add/struct.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/struct.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/symbol.rb
===================================================================
--- ext/json/lib/json/add/symbol.rb	(revision 55670)
+++ ext/json/lib/json/add/symbol.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/symbol.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/complex.rb
===================================================================
--- ext/json/lib/json/add/complex.rb	(revision 55670)
+++ ext/json/lib/json/add/complex.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/complex.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/add/core.rb
===================================================================
--- ext/json/lib/json/add/core.rb	(revision 55670)
+++ ext/json/lib/json/add/core.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/core.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 # This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
Index: ext/json/lib/json/add/rational.rb
===================================================================
--- ext/json/lib/json/add/rational.rb	(revision 55670)
+++ ext/json/lib/json/add/rational.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/add/rational.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
Index: ext/json/lib/json/common.rb
===================================================================
--- ext/json/lib/json/common.rb	(revision 55670)
+++ ext/json/lib/json/common.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/common.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/version'
 require 'json/generic_object'
 
Index: ext/json/lib/json/ext/.keep
===================================================================
--- ext/json/lib/json/ext/.keep	(revision 55670)
+++ ext/json/lib/json/ext/.keep	(revision 55671)
@@ -1 +0,0 @@
-
Index: ext/json/lib/json/ext.rb
===================================================================
--- ext/json/lib/json/ext.rb	(revision 55670)
+++ ext/json/lib/json/ext.rb	(revision 55671)
@@ -1,4 +1,3 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/ext.rb#L1
-# frozen_string_literal: false
 require 'json/common'
 
 module JSON
Index: ext/json/lib/json/generic_object.rb
===================================================================
--- ext/json/lib/json/generic_object.rb	(revision 55670)
+++ ext/json/lib/json/generic_object.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/generic_object.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'ostruct'
 
 module JSON
Index: ext/json/lib/json.rb
===================================================================
--- ext/json/lib/json.rb	(revision 55670)
+++ ext/json/lib/json.rb	(revision 55671)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json.rb#L1
-# frozen_string_literal: false
+#frozen_string_literal: false
 require 'json/common'
 
 ##
Index: ext/json/extconf.rb
===================================================================
--- ext/json/extconf.rb	(revision 55670)
+++ ext/json/extconf.rb	(revision 55671)
@@ -1,4 +1,2 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/extconf.rb#L1
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('json')
-
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55670)
+++ ChangeLog	(revision 55671)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jul 14 12:48:47 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* ext/json/**/*.rb: merge original files from upstream repository.
+	  It only fixes styles of frozen string literal.
+
 Wed Jul 13 22:23:03 2016  SHIBATA Hiroshi  <hsbt@r...>
 
 	* test/json/json_common_interface_test.rb: use assert_raise instead of

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/