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

Commits on Oct 13, 2015

  1. [Truffle] Increase Truffle version.

    @chrisseaton
    chrisseaton committed Oct 13, 2015
    Copy the full SHA
    f181069 View commit details

  2. [Truffle] RubyLanguage.toString

    @chrisseaton
    chrisseaton committed Oct 13, 2015
    Copy the full SHA
    8a71776 View commit details
Showing with 10 additions and 5 deletions.
  1. +1 −1 truffle/pom.rb
  2. +4 −4 truffle/pom.xml
  3. +5 −0 truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
2 changes: 1 addition & 1 deletion truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = '145f995cd2fe236f65b53f36c41eeb420333647b-SNAPSHOT'
truffle_version = 'd9b3e229ee465426afd7d2a54563c9220c53e5cc-SNAPSHOT'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-debug:' + truffle_version
jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
8 changes: 4 additions & 4 deletions truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -36,23 +36,23 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-api</artifactId>
<version>145f995cd2fe236f65b53f36c41eeb420333647b-SNAPSHOT</version>
<version>d9b3e229ee465426afd7d2a54563c9220c53e5cc-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-debug</artifactId>
<version>145f995cd2fe236f65b53f36c41eeb420333647b-SNAPSHOT</version>
<version>d9b3e229ee465426afd7d2a54563c9220c53e5cc-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-dsl-processor</artifactId>
<version>145f995cd2fe236f65b53f36c41eeb420333647b-SNAPSHOT</version>
<version>d9b3e229ee465426afd7d2a54563c9220c53e5cc-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-tck</artifactId>
<version>145f995cd2fe236f65b53f36c41eeb420333647b-SNAPSHOT</version>
<version>d9b3e229ee465426afd7d2a54563c9220c53e5cc-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
5 changes: 5 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -115,6 +115,11 @@ protected Object evalInContext(Source source, Node node, MaterializedFrame mFram
return null;
}

@Override
protected String toString(RubyContext context, Object value) {
return context.send(value, "inspect", null).toString();
}

public Node unprotectedCreateFindContextNode() {
return super.createFindContextNode();
}