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: 861b3835f8aa
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f55efafc7854
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 23, 2015

  1. Properly copy code range for String#*.

    @headius
    headius committed Mar 23, 2015
    Copy the full SHA
    f04e522 View commit details

  2. Reduce test_m17n excludes to remaining failures.

    @headius
    headius committed Mar 23, 2015
    Copy the full SHA
    f55efaf View commit details
Showing with 5 additions and 18 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyString.java
  2. +4 −17 test/mri/excludes/TestM17N.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyString.java
View file
Original file line number Diff line number Diff line change
@@ -1126,7 +1126,7 @@ public IRubyObject op_mul(ThreadContext context, IRubyObject other) {
public IRubyObject op_mul19(ThreadContext context, IRubyObject other) {
RubyString result = multiplyByteList(context, other);
result.value.setEncoding(value.getEncoding());
result.copyCodeRange(this);
result.copyCodeRangeForSubstr(this, value.getEncoding());
return result;
}

21 changes: 4 additions & 17 deletions test/mri/excludes/TestM17N.rb
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
exclude :test_delete, "needs investigation"
exclude :test_end_with, "needs investigation"
exclude :test_euc_tw, "needs investigation"
exclude :test_force_encoding, "needs investigation"
exclude :test_nonascii_method_name, "needs investigation"
exclude :test_object_inspect_external, "needs investigation"
exclude :test_object_utf16_32_inspect, "needs investigation"
exclude :test_regexp_ascii, "needs investigation"
exclude :test_scrub, ""
exclude :test_sprintf_c, "format string encoding should be used to decode incoming fixnums"
exclude :test_str_concat, "needs investigation"
exclude :test_string_inspect_encoding, "needs investigation"
exclude :test_string_mixed_unicode, "needs investigation"
exclude :test_symbol, "needs investigation"
exclude :test_symbol_op, "some symbols are created early and do not have UTF-8 encoding"
exclude :test_union_1_nonascii_string, "needs investigation"
exclude :test_valid_encoding, "needs investigation"
exclude :test_nonascii_method_name, "lexer is not pulling mbc characters off the wire correctly"
exclude :test_string_mixed_unicode, "lexer is not pulling mbc characters off the wire correctly, not producing syntax error"
exclude :test_symbol, "management of differently-encoded symbols is not right"
exclude :test_symbol_op, "some symbols are created early and do not have UTF-8 encoding; management of differently-encoded symbols is not right"