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

Commits on Dec 18, 2014

  1. [Truffle] Fixed typo.

    @nirvdrum
    nirvdrum committed Dec 18, 2014
    Copy the full SHA
    5a14923 View commit details

  2. Removed an unused reference and inlined another.

    @nirvdrum
    nirvdrum committed Dec 18, 2014
    Copy the full SHA
    69212f8 View commit details
Showing with 2 additions and 4 deletions.
  1. +1 −3 core/src/main/java/org/jruby/RubyMatchData.java
  2. +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
4 changes: 1 addition & 3 deletions core/src/main/java/org/jruby/RubyMatchData.java
View file
Original file line number Diff line number Diff line change
@@ -593,10 +593,8 @@ public IRubyObject initialize_copy(IRubyObject original) {

checkFrozen();

Ruby runtime = getRuntime();
ThreadContext context = runtime.getCurrentContext();
if (!(original instanceof RubyMatchData)) {
throw runtime.newTypeError("wrong argument class");
throw getRuntime().newTypeError("wrong argument class");
}

RubyMatchData origMatchData = (RubyMatchData)original;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/runtime/core/RubyRegexp.java
View file
Original file line number Diff line number Diff line change
@@ -198,7 +198,7 @@ public Object matchCommon(ByteList bytes, boolean operator, boolean setNamedCapt

final Object value;

// Copied from jubry/RubyRegexp - see copyright notice there
// Copied from jruby/RubyRegexp - see copyright notice there

if (region == null) {
if (nth >= 1 || (nth < 0 && ++nth <= 0)) {