Fixes for msgpack to pass all specs of msgpack v1.2.6

PullRequest: truffleruby/538

Author: eregon

lib/truffle/stringio.rb

@@ -69,8 +69,7 @@ def self.open(*args)
 
   def initialize(string=nil, mode=nil)
     if string.nil?
-      @__data__ = Data.new ''
-      set_encoding(nil)
+      @__data__ = Data.new ''.force_encoding(Encoding.default_external)
       mode = IO::RDWR
     else
       string = Truffle::Type.coerce_to string, String, :to_str
@@ -104,19 +103,15 @@ def initialize_copy(from)
     self
   end
 
-  def check_readable
+  private def check_readable
     raise IOError, 'not opened for reading' unless @readable
   end
 
-  private :check_readable
-
-  def check_writable
+  private def check_writable
     raise IOError, 'not opened for writing' unless @writable
     raise IOError, 'unable to modify data' if @__data__.string.frozen?
   end
 
-  private :check_writable
-
   def set_encoding(external, internal=nil, options=nil)
     encoding = external || Encoding.default_external
     @__data__.encoding = encoding
@@ -148,7 +143,6 @@ def each_byte
 
     self
   end
-
   alias_method :bytes, :each_byte
 
   def each_char
@@ -159,7 +153,6 @@ def each_char
 
     self
   end
-
   alias_method :chars, :each_char
 
   def each_codepoint(&block)
@@ -182,7 +175,6 @@ def each_codepoint(&block)
 
     self
   end
-
   alias_method :codepoints, :each_codepoint
 
   def each(sep=$/, limit=Undefined)
@@ -663,9 +655,7 @@ def yaml_initialize(type, val)
     @__data__ = Data.new('')
   end
 
-  protected
-
-  def mode_from_string(mode)
+  private def mode_from_string(mode)
     @append = truncate = false
 
     if mode[0] == ?r
@@ -688,7 +678,7 @@ def mode_from_string(mode)
     d.string.replace('') if truncate
   end
 
-  def mode_from_integer(mode)
+  private def mode_from_integer(mode)
     @readable = @writable = @append = false
     d = @__data__
 
@@ -705,7 +695,7 @@ def mode_from_integer(mode)
     d.string.replace('') if (mode & IO::TRUNC) != 0
   end
 
-  def getline(arg_error, sep, limit)
+  private def getline(arg_error, sep, limit)
     if limit != Undefined
       limit = Truffle::Type.coerce_to_int limit if limit
       sep = Truffle::Type.coerce_to sep, String, :to_str if sep

lib/truffle/truffle/cext.rb

@@ -362,7 +362,7 @@ def rb_type(value)
       T_DATA
     when Data
       T_DATA
-    when Object
+    when BasicObject
       if hidden_variable_get(value, :data_holder)
         T_DATA
       else

spec/ruby/library/stringio/initialize_spec.rb

@@ -183,3 +183,27 @@
     @io.string.should == ""
   end
 end
+
+describe "StringIO#initialize sets the encoding to" do
+  before :each do
+    @external = Encoding.default_external
+    Encoding.default_external = Encoding::ISO_8859_2
+  end
+
+  after :each do
+    Encoding.default_external = @external
+  end
+
+  it "Encoding.default_external when passed no arguments" do
+    io = StringIO.new
+    io.external_encoding.should == Encoding::ISO_8859_2
+    io.string.encoding.should == Encoding::ISO_8859_2
+  end
+
+  it "the same as the encoding of the String when passed a String" do
+    s = ''.force_encoding(Encoding::EUC_JP)
+    io = StringIO.new(s)
+    io.external_encoding.should == Encoding::EUC_JP
+    io.string.encoding.should == Encoding::EUC_JP
+  end
+end

spec/ruby/optional/capi/bignum_spec.rb

@@ -97,6 +97,16 @@ def ensure_bignum(n)
     end
   end
 
+  describe "RBIGNUM_SIGN" do
+    it "returns 1 for a positive Bignum" do
+      @s.RBIGNUM_SIGN(bignum_value(1)).should == 1
+    end
+
+    it "returns 0 for a negative Bignum" do
+      @s.RBIGNUM_SIGN(-bignum_value(1)).should == 0
+    end
+  end
+
   describe "rb_big_cmp" do
     it "compares a Bignum with a Bignum" do
       @s.rb_big_cmp(bignum_value, bignum_value(1)).should == -1

spec/ruby/optional/capi/ext/bignum_spec.c

@@ -31,6 +31,10 @@ static VALUE bignum_spec_rb_big2ulong(VALUE self, VALUE num) {
   return ULONG2NUM(rb_big2ulong(num));
 }
 
+static VALUE bignum_spec_RBIGNUM_SIGN(VALUE self, VALUE val) {
+  return INT2FIX(RBIGNUM_SIGN(val));
+}
+
 static VALUE bignum_spec_rb_big_cmp(VALUE self, VALUE x, VALUE y) {
   return rb_big_cmp(x, y);
 }
@@ -90,6 +94,7 @@ void Init_bignum_spec(void) {
   rb_define_method(cls, "rb_big2long", bignum_spec_rb_big2long, 1);
   rb_define_method(cls, "rb_big2str", bignum_spec_rb_big2str, 2);
   rb_define_method(cls, "rb_big2ulong", bignum_spec_rb_big2ulong, 1);
+  rb_define_method(cls, "RBIGNUM_SIGN", bignum_spec_RBIGNUM_SIGN, 1);
   rb_define_method(cls, "rb_big_cmp", bignum_spec_rb_big_cmp, 2);
   rb_define_method(cls, "rb_big_pack", bignum_spec_rb_big_pack, 1);
   rb_define_method(cls, "rb_big_pack_array", bignum_spec_rb_big_pack_array, 2);

spec/ruby/optional/capi/ext/kernel_spec.c

@@ -26,6 +26,9 @@ VALUE kernel_spec_rb_block_proc(VALUE self) {
   return rb_block_proc();
 }
 
+VALUE kernel_spec_rb_block_lambda(VALUE self) {
+  return rb_block_lambda();
+}
 
 VALUE block_call_inject(VALUE yield_value, VALUE data2) {
   /* yield_value yields the first block argument */
@@ -286,6 +289,7 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_block_call_multi_arg", kernel_spec_rb_block_call_multi_arg, 1);
   rb_define_method(cls, "rb_block_call_no_func", kernel_spec_rb_block_call_no_func, 1);
   rb_define_method(cls, "rb_block_proc", kernel_spec_rb_block_proc, 0);
+  rb_define_method(cls, "rb_block_lambda", kernel_spec_rb_block_lambda, 0);
   rb_define_method(cls, "rb_frame_this_func_test", kernel_spec_rb_frame_this_func, 0);
   rb_define_method(cls, "rb_frame_this_func_test_again", kernel_spec_rb_frame_this_func, 0);
   rb_define_method(cls, "rb_ensure", kernel_spec_rb_ensure, 4);

spec/ruby/optional/capi/kernel_spec.rb

@@ -440,6 +440,32 @@ def proc_caller
       proc = @s.rb_block_proc() { 1+1 }
       proc.should be_kind_of(Proc)
       proc.call.should == 2
+      proc.lambda?.should == false
+    end
+
+    it "passes through an existing lambda and does not convert to a proc" do
+      b = -> { 1+1 }
+      proc = @s.rb_block_proc(&b)
+      proc.should equal(b)
+      proc.call.should == 2
+      proc.lambda?.should == true
+    end
+  end
+
+  describe "rb_block_lambda" do
+    it "converts the implicit block into a Proc but does not convert it to a lambda" do
+      proc = @s.rb_block_proc { 1+1 }
+      proc.should be_kind_of(Proc)
+      proc.call.should == 2
+      proc.lambda?.should == false
+    end
+
+    it "passes through an existing Proc and does not convert to a lambda" do
+      b = proc { 1+1 }
+      proc = @s.rb_block_proc(&b)
+      proc.should equal(b)
+      proc.call.should == 2
+      proc.lambda?.should == false
     end
   end
 

src/main/c/cext/ruby.c

@@ -671,6 +671,10 @@ unsigned long rb_big2ulong(VALUE x) {
   return polyglot_as_i64(RUBY_CEXT_INVOKE_NO_WRAP("rb_num2ulong", x));
 }
 
+int rb_big_sign(VALUE x) {
+  return RTEST(RUBY_INVOKE(x, ">=", INT2FIX(0))) ? 1 : 0;
+}
+
 VALUE rb_big_cmp(VALUE x, VALUE y) {
   return RUBY_INVOKE(x, "<=>", y);
 }
@@ -1759,7 +1763,7 @@ VALUE rb_block_proc(void) {
 }
 
 VALUE rb_block_lambda(void) {
-  return RUBY_CEXT_INVOKE("rb_block_lambda");
+  return rb_block_proc();
 }
 
 VALUE rb_yield(VALUE value) {

test/truffle/cexts/msgpack/msgpack.sh

@@ -4,4 +4,13 @@ source test/truffle/common.sh.inc
 
 jt gem-test-pack
 
-jt ruby -S gem install --local "$(jt gem-test-pack)/gem-cache/msgpack-1.2.4.gem" -V -N --backtrace
+ruby_home="$PWD"
+export PATH="$ruby_home/bin:$PATH"
+
+# gem install "$(jt gem-test-pack)/gem-cache/bundler-1.16.5.gem" --local
+
+cd "$(jt gem-test-pack)/gem-testing/msgpack-ruby"
+
+bundle install --local --no-cache
+bundle exec rake compile
+bundle exec rake spec

tool/jt.rb

@@ -25,7 +25,7 @@
 MRI_TEST_CEXT_LIB_DIR = "#{TRUFFLERUBY_DIR}/.ext/c"
 PROFILES_DIR = "#{TRUFFLERUBY_DIR}/profiles"
 
-TRUFFLERUBY_GEM_TEST_PACK_VERSION = "f23314cbf560d8578b0c2cbd972b83575ba93cd5"
+TRUFFLERUBY_GEM_TEST_PACK_VERSION = "af03b9fbb684624095de928f2b6238db26544052"
 
 JDEBUG_PORT = 51819
 JDEBUG = "-J-agentlib:jdwp=transport=dt_socket,server=y,address=#{JDEBUG_PORT},suspend=y"
@@ -1205,14 +1205,16 @@ def test_cexts(*args)
           end
 
           # Tests using gem install to compile the cexts
-          sh "test/truffle/cexts/msgpack/msgpack.sh"
           sh "test/truffle/cexts/puma/puma.sh"
           sh "test/truffle/cexts/sqlite3/sqlite3.sh"
           sh "test/truffle/cexts/unf_ext/unf_ext.sh"
           sh "test/truffle/cexts/json/json.sh"
 
           # Test a gem dynamically compiling a C extension
           sh "test/truffle/cexts/RubyInline/RubyInline.sh"
+
+          # Test cexts used by many projects
+          sh "test/truffle/cexts/msgpack/msgpack.sh"
       else
         raise "unknown test: #{test_name}"
       end