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

Commits on Nov 11, 2014

  1. Trivial add TC and use context over ctx

    @enebo
    enebo committed Nov 11, 2014
    Copy the full SHA
    aa31b5f View commit details

  2. Simple warning removal

    @enebo
    enebo committed Nov 11, 2014
    Copy the full SHA
    01fae93 View commit details

  3. Use released versions of jcodings and bytelist

    @enebo
    enebo committed Nov 11, 2014
    Copy the full SHA
    2eaa202 View commit details
Showing with 85 additions and 113 deletions.
  1. +2 −2 core/pom.rb
  2. +2 −2 core/pom.xml
  3. +4 −4 core/src/main/java/org/jruby/ext/digest/RubyDigest.java
  4. +77 −105 core/src/main/java/org/jruby/ir/IRBuilder.java
4 changes: 2 additions & 2 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@
jar 'com.github.jnr:jffi:${jffi.version}:native'

jar 'org.jruby.joni:joni:2.1.3'
jar 'org.jruby.extras:bytelist:1.0.12-SNAPSHOT'
jar 'org.jruby.jcodings:jcodings:1.0.12-SNAPSHOT'
jar 'org.jruby.extras:bytelist:1.0.12'
jar 'org.jruby.jcodings:jcodings:1.0.12'

jar 'com.headius:invokebinder:1.5-SNAPSHOT'
jar 'com.headius:options:1.1'
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -102,12 +102,12 @@
<dependency>
<groupId>org.jruby.extras</groupId>
<artifactId>bytelist</artifactId>
<version>1.0.12-SNAPSHOT</version>
<version>1.0.12</version>
</dependency>
<dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>1.0.12-SNAPSHOT</version>
<version>1.0.12</version>
</dependency>
<dependency>
<groupId>com.headius</groupId>
8 changes: 4 additions & 4 deletions core/src/main/java/org/jruby/ext/digest/RubyDigest.java
View file
Original file line number Diff line number Diff line change
@@ -334,8 +334,8 @@ public static IRubyObject hexdigest_bang(ThreadContext context, IRubyObject self
}

@JRubyMethod(name = "bubblebabble", required = 1, optional = 1, meta = true)
public static IRubyObject bubblebabble(ThreadContext ctx, IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
byte[] digest = recv.callMethod(ctx, "digest", args, Block.NULL_BLOCK).convertToString().getBytes();
public static IRubyObject bubblebabble(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block unusedBlock) {
byte[] digest = recv.callMethod(context, "digest", args, Block.NULL_BLOCK).convertToString().getBytes();
return RubyString.newString(recv.getRuntime(), BubbleBabble.bubblebabble(digest));
}

@@ -479,8 +479,8 @@ public IRubyObject reset() {
}

@JRubyMethod()
public IRubyObject bubblebabble() {
return RubyString.newString(getRuntime(), BubbleBabble.bubblebabble(algo.digest()));
public IRubyObject bubblebabble(ThreadContext context) {
return RubyString.newString(context.runtime, BubbleBabble.bubblebabble(algo.digest()));
}

private void setAlgorithm(Metadata metadata) throws NoSuchAlgorithmException {
Loading