diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/json/extconf.rb | 2 | ||||
-rw-r--r-- | ext/json/generator/extconf.rb | 1 | ||||
-rw-r--r-- | ext/json/lib/json.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/bigdecimal.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/complex.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/core.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/date.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/date_time.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/exception.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/ostruct.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/range.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/rational.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/regexp.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/struct.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/symbol.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/add/time.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/common.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/ext.rb | 1 | ||||
-rw-r--r-- | ext/json/lib/json/ext/.keep | 1 | ||||
-rw-r--r-- | ext/json/lib/json/generic_object.rb | 2 |
21 files changed, 21 insertions, 21 deletions
@@ -1,3 +1,8 @@ +Thu Jul 14 12:48:47 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * 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@ruby-lang.org> * test/json/json_common_interface_test.rb: use assert_raise instead of diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb index ad1ef9ba82..7595d58a98 100644 --- a/ext/json/extconf.rb +++ b/ext/json/extconf.rb @@ -1,4 +1,2 @@ -# frozen_string_literal: false require 'mkmf' create_makefile('json') - diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb index fd5c4a7f49..8627c5f4bd 100644 --- a/ext/json/generator/extconf.rb +++ b/ext/json/generator/extconf.rb @@ -1,4 +1,3 @@ -# frozen_string_literal: false require 'mkmf' $defs << "-DJSON_GENERATOR" diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index 61bb8fae0e..b5a6912415 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false require 'json/common' ## diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb index a7646860a2..539daeeaf5 100644 --- a/ext/json/lib/json/add/bigdecimal.rb +++ b/ext/json/lib/json/add/bigdecimal.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb index 65d388b48a..28ef734daf 100644 --- a/ext/json/lib/json/add/complex.rb +++ b/ext/json/lib/json/add/complex.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb index 93b2bff424..bfb017c460 100644 --- a/ext/json/lib/json/add/core.rb +++ b/ext/json/lib/json/add/core.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false # This file requires the implementations of ruby core's custom objects for # serialisation/deserialisation. diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb index b58af76e10..25523561a5 100644 --- a/ext/json/lib/json/add/date.rb +++ b/ext/json/lib/json/add/date.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb index f794eb3d7d..38b0e86ab8 100644 --- a/ext/json/lib/json/add/date_time.rb +++ b/ext/json/lib/json/add/date_time.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb index caac713c6a..a107e5b3c4 100644 --- a/ext/json/lib/json/add/exception.rb +++ b/ext/json/lib/json/add/exception.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb index 1f9ce7b3b4..7c13910052 100644 --- a/ext/json/lib/json/add/ostruct.rb +++ b/ext/json/lib/json/add/ostruct.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb index 3ef20150bf..93529fb1c4 100644 --- a/ext/json/lib/json/add/range.rb +++ b/ext/json/lib/json/add/range.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb index e83a532775..356940b225 100644 --- a/ext/json/lib/json/add/rational.rb +++ b/ext/json/lib/json/add/rational.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb index 41b260f307..a93866b05a 100644 --- a/ext/json/lib/json/add/regexp.rb +++ b/ext/json/lib/json/add/regexp.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb index d08d88237a..e8395ed42f 100644 --- a/ext/json/lib/json/add/struct.rb +++ b/ext/json/lib/json/add/struct.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb index 31b56a294f..74b13a423f 100644 --- a/ext/json/lib/json/add/symbol.rb +++ b/ext/json/lib/json/add/symbol.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb index 80b6434f17..b73acc4086 100644 --- a/ext/json/lib/json/add/time.rb +++ b/ext/json/lib/json/add/time.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED require 'json' end diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index a0221fe94b..7cc852916c 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false require 'json/version' require 'json/generic_object' diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb index 43b8519b34..7264a857fa 100644 --- a/ext/json/lib/json/ext.rb +++ b/ext/json/lib/json/ext.rb @@ -1,4 +1,3 @@ -# frozen_string_literal: false require 'json/common' module JSON diff --git a/ext/json/lib/json/ext/.keep b/ext/json/lib/json/ext/.keep index 8b13789179..e69de29bb2 100644 --- a/ext/json/lib/json/ext/.keep +++ b/ext/json/lib/json/ext/.keep @@ -1 +0,0 @@ - diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb index 8d72d90092..108309db26 100644 --- a/ext/json/lib/json/generic_object.rb +++ b/ext/json/lib/json/generic_object.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +#frozen_string_literal: false require 'ostruct' module JSON |