Merge branch 'master' into replace-nan

11 files changed, 44 insertions, 37 deletions

diff --git a/.travis.yml b/.travis.yml
index c6bbb0d..b8105b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ bundler_args: --binstubs
 
 # Specify which ruby versions you wish to run your tests on, each version will be used
 rvm:
+  - 1.8.6
   - 1.8.7
   - 1.9.2
   - 1.9.3
diff --git a/CHANGES b/CHANGES
index bd48aab..020c5ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2012-08-17 (1.7.5)
+  * Fix compilation of extension on older rubies.
 2012-07-26 (1.7.4)
   * Fix compilation problem on AIX, see https://github.com/flori/json/issues/142
 2012-05-12 (1.7.3)
diff --git a/Gemfile b/Gemfile
index 209dcb6..5a97c8c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,5 +12,5 @@ group :development, :test do
 end
 
 group :test do
-  gem 'test-unit', '2.4.7', :platform => :mri_19
+  gem 'test-unit', '~> 2.5', :platform => :mri_19
 end
diff --git a/Rakefile b/Rakefile
index 4be85ff..b71df69 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,6 +23,10 @@ class UndocumentedTestTask < Rake::TestTask
   def desc(*) end
 end
 
+def skip_sdoc(src)
+  src.gsub(/^.*sdoc.*/) { |s| s + ' if RUBY_VERSION > "1.8.6"' }
+end
+
 MAKE   = ENV['MAKE']   || %w[gmake make].find { |c| system(c, '-v') }
 BUNDLE = ENV['BUNDLE'] || %w[bundle].find { |c| system(c, '-v') }
 PKG_NAME          = 'json'
@@ -84,7 +88,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
 
     s.require_path = 'lib'
     s.add_development_dependency 'permutation'
-    s.add_development_dependency 'sdoc'
+    s.add_development_dependency 'sdoc', '~> 0.3.16'
     s.add_development_dependency 'rake', '~>0.9.2'
 
     s.extra_rdoc_files << 'README.rdoc'
@@ -101,7 +105,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
   desc 'Creates a json_pure.gemspec file'
   task :gemspec_pure => :version do
     File.open('json_pure.gemspec', 'w') do |gemspec|
-      gemspec.write spec_pure.to_ruby
+      gemspec.write skip_sdoc(spec_pure.to_ruby)
     end
   end
 
@@ -122,7 +126,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
 
     s.require_path = 'lib'
     s.add_development_dependency 'permutation'
-    s.add_development_dependency 'sdoc'
+    s.add_development_dependency 'sdoc', '~> 0.3.16'
 
     s.extra_rdoc_files << 'README.rdoc'
     s.rdoc_options <<
@@ -138,7 +142,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
   desc 'Creates a json.gemspec file'
   task :gemspec_ext => :version do
     File.open('json.gemspec', 'w') do |gemspec|
-      gemspec.write spec_ext.to_ruby
+      gemspec.write skip_sdoc(spec_ext.to_ruby)
     end
   end
 
diff --git a/VERSION b/VERSION
index 10c0880..6a126f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.4
+1.7.5
diff --git a/ext/json/ext/fbuffer/fbuffer.h b/ext/json/ext/fbuffer/fbuffer.h
index 0c53296..b5e47ee 100644
--- a/ext/json/ext/fbuffer/fbuffer.h
+++ b/ext/json/ext/fbuffer/fbuffer.h
@@ -5,6 +5,27 @@
 #include "ruby.h"
 #include <assert.h>
 
+#ifndef RHASH_SIZE
+#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
+#endif
+
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
+#endif
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
 #ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
 #define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
index 092f1e9..7473332 100644
--- a/ext/json/ext/generator/generator.c
+++ b/ext/json/ext/generator/generator.c
@@ -871,7 +871,7 @@ static int isArrayOrObject(VALUE string)
     if (string_len < 2) return 0;
     for (; p < q && isspace(*p); p++);
     for (; q > p && isspace(*q); q--);
-    return *p == '[' && *q == ']' || *p == '{' && *q == '}';
+    return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
 }
 
 /*
diff --git a/ext/json/ext/generator/generator.h b/ext/json/ext/generator/generator.h
index 1625e63..25d4d53 100644
--- a/ext/json/ext/generator/generator.h
+++ b/ext/json/ext/generator/generator.h
@@ -16,27 +16,6 @@
 
 #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
 
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
-#endif
-
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
 /* unicode defintions */
 
 #define UNI_STRICT_CONVERSION 1
diff --git a/json.gemspec b/json.gemspec
index b6d8026..39addce 100644
--- a/json.gemspec
+++ b/json.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "1.7.4"
+  s.version = "1.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<permutation>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
+      s.add_development_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
     else
       s.add_dependency(%q<permutation>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
+      s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
     end
   else
     s.add_dependency(%q<permutation>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
+    s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
   end
 end
diff --git a/json_pure.gemspec b/json_pure.gemspec
index f18804d..33b0231 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "json_pure"
-  s.version = "1.7.4"
+  s.version = "1.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<permutation>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
+      s.add_development_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
     else
       s.add_dependency(%q<permutation>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
+      s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
     end
   else
     s.add_dependency(%q<permutation>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
+    s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
     s.add_dependency(%q<rake>, ["~> 0.9.2"])
   end
 end
diff --git a/lib/json/version.rb b/lib/json/version.rb
index e0fc0b4..45af03f 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.7.4'
+  VERSION         = '1.7.5'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc: