Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 48b2185852e3
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ade6c99dbdaf
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 29, 2015

  1. These need typechecks; MRI does == INT2FIX.

    @headius
    headius committed Mar 29, 2015
    Copy the full SHA
    df1e20b View commit details

  2. These all pass now.

    @headius
    headius committed Mar 29, 2015
    Copy the full SHA
    ade6c99 View commit details
14 changes: 7 additions & 7 deletions core/src/main/java/org/jruby/util/io/EncodingUtils.java
View file
Original file line number Diff line number Diff line change
@@ -1339,7 +1339,7 @@ public static Encoding ioStripBOM(ThreadContext context, RubyIO io) {
switch ((int)((RubyFixnum)b1).getLongValue()) {
case 0xEF:
if ((b2 = io.getbyte(context)).isNil()) break;
if (((RubyFixnum)b2).getLongValue() == 0xBB && !(b3 = io.getbyte(context)).isNil()) {
if (b2 instanceof RubyFixnum && ((RubyFixnum)b2).getLongValue() == 0xBB && !(b3 = io.getbyte(context)).isNil()) {
if (((RubyFixnum)b3).getLongValue() == 0xBF) {
return UTF8Encoding.INSTANCE;
}
@@ -1349,16 +1349,16 @@ public static Encoding ioStripBOM(ThreadContext context, RubyIO io) {
break;
case 0xFE:
if ((b2 = io.getbyte(context)).isNil()) break;
if (((RubyFixnum)b2).getLongValue() == 0xFF) {
if (b2 instanceof RubyFixnum && ((RubyFixnum)b2).getLongValue() == 0xFF) {
return UTF16BEEncoding.INSTANCE;
}
io.ungetbyte(context, b2);
break;
case 0xFF:
if ((b2 = io.getbyte(context)).isNil()) break;
if (((RubyFixnum)b2).getLongValue() == 0xFE) {
if (b2 instanceof RubyFixnum && ((RubyFixnum)b2).getLongValue() == 0xFE) {
b3 = io.getbyte(context);
if (((RubyFixnum)b3).getLongValue() == 0 && !(b4 = io.getbyte(context)).isNil()) {
if (b3 instanceof RubyFixnum && ((RubyFixnum)b3).getLongValue() == 0 && !(b4 = io.getbyte(context)).isNil()) {
if (((RubyFixnum)b4).getLongValue() == 0) {
return UTF32LEEncoding.INSTANCE;
}
@@ -1373,9 +1373,9 @@ public static Encoding ioStripBOM(ThreadContext context, RubyIO io) {
break;
case 0:
if ((b2 = io.getbyte(context)).isNil()) break;
if (((RubyFixnum)b2).getLongValue() == 0 && !(b3 = io.getbyte(context)).isNil()) {
if (((RubyFixnum)b3).getLongValue() == 0xFE && !(b4 = io.getbyte(context)).isNil()) {
if (((RubyFixnum)b4).getLongValue() == 0xFF) {
if (b2 instanceof RubyFixnum && ((RubyFixnum)b2).getLongValue() == 0 && !(b3 = io.getbyte(context)).isNil()) {
if (b3 instanceof RubyFixnum && ((RubyFixnum)b3).getLongValue() == 0xFE && !(b4 = io.getbyte(context)).isNil()) {
if (b4 instanceof RubyFixnum && ((RubyFixnum)b4).getLongValue() == 0xFF) {
return UTF32BEEncoding.INSTANCE;
}
io.ungetbyte(context, b4);
6 changes: 0 additions & 6 deletions test/mri/excludes/Emoji/TestKDDI.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
exclude :test_kddi, "needs investigation"
exclude :test_to_docomo, "needs investigation"
exclude :test_to_eucjp, "needs investigation"
exclude :test_to_sjis, "needs investigation"
exclude :test_to_softbank, "needs investigation"
exclude :test_to_utf8, "needs investigation"
2 changes: 0 additions & 2 deletions test/mri/excludes/TestERB.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
exclude :test_concurrent_default_binding, "needs investigation"
exclude :test_literal_encoding, "needs investigation"
exclude :test_result_encoding, "needs investigation"
3 changes: 0 additions & 3 deletions test/mri/excludes/TestFile.rb
View file

This file was deleted.

1 change: 0 additions & 1 deletion test/mri/excludes/TestGB18030.rb
View file

This file was deleted.

2 changes: 0 additions & 2 deletions test/mri/excludes/TestIO_M17N.rb
View file
Original file line number Diff line number Diff line change
@@ -13,5 +13,3 @@
exclude :test_undef_w_stateful, "needs investigation"
exclude :test_undef_w_stateless, "needs investigation"
exclude :test_ungetc_int, "needs investigation"
exclude :test_ungetc_str, "needs investigation"
exclude :test_w_xml_attr, "needs investigation"
5 changes: 0 additions & 5 deletions test/mri/excludes/TestString.rb
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
exclude :test_LSHIFT, "needs investigation"
exclude :test_LSHIFT_neary_long_max, "expects reliable NoMemoryError"
exclude :test_count, "needs investigation"
exclude :test_dummy_inspect, "needs investigation"
exclude :test_eq_tilde_can_be_overridden, "needs investigation"
exclude :test_partition, "needs investigation"
exclude :test_regexp_match_subclass, "String subclass with overridden =~ should see obj =~ dispatch (#2157)"
exclude :test_rpartition, "needs investigation"
exclude :test_rstrip, "needs investigation"
exclude :test_split, "needs investigation"
exclude :test_to_i, "needs investigation"
exclude :test_tr, "needs investigation"
5 changes: 0 additions & 5 deletions test/mri/excludes/TestTranscode.rb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
exclude :test_from_cp50221, "needs investigation"
exclude :test_gb18030, "perhaps a bug in pack wrt encoded text"
exclude :test_gb2312, "needs investigation"
exclude :'test_pseudo_encoding_inspect(UTF-16)', "needs investigation"
exclude :'test_pseudo_encoding_inspect(UTF-32)', "needs investigation"
exclude :test_to_cp50221, "needs investigation"
exclude :test_unicode_public_review_issue_121, "broken via charset replacement"
exclude :test_utf8_mac, "needs investigation"
exclude :test_utf_32_bom, "needs investigation"