Merge branch 'zenspider/ruby-2.7' of https://github.com/zenspider/json into zenspider-zenspider/ruby-2.7

2 files changed, 11 insertions, 2 deletions

diff --git a/lib/json/pure/generator.rb b/lib/json/pure/generator.rb
index ccb6fe4..a1143f8 100644
--- a/lib/json/pure/generator.rb
+++ b/lib/json/pure/generator.rb
@@ -250,7 +250,8 @@ module JSON
           if respond_to?(name)
             __send__(name)
           else
-            instance_variable_get("@#{name}")
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
           end
         end
 
diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb
index 3a6343b..5340296 100644
--- a/lib/json/pure/parser.rb
+++ b/lib/json/pure/parser.rb
@@ -197,7 +197,15 @@ module JSON
       def parse_value
         case
         when scan(FLOAT)
-          @decimal_class && @decimal_class.new(self[1]) || Float(self[1])
+          if @decimal_class then
+            if @decimal_class == BigDecimal then
+              BigDecimal(self[1])
+            else
+              @decimal_class.new(self[1]) || Float(self[1])
+            end
+          else
+            Float(self[1])
+          end
         when scan(INTEGER)
           Integer(self[1])
         when scan(TRUE)