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

Commits on May 21, 2016

  1. Copy the full SHA
    de67bd4 View commit details
  2. Copy the full SHA
    8665f3f View commit details
Showing with 4 additions and 2 deletions.
  1. +1 −1 truffle/pom.rb
  2. +1 −1 truffle/pom.xml
  3. +2 −0 truffle/src/main/java/org/jruby/truffle/language/RubyTypes.java
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => '47a52ed08706d38820df191be74785d018f60345-SNAPSHOT',
'truffle.version' => '0.14-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>47a52ed08706d38820df191be74785d018f60345-SNAPSHOT</truffle.version>
<truffle.version>0.14-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
Original file line number Diff line number Diff line change
@@ -11,8 +11,10 @@

import com.oracle.truffle.api.dsl.ImplicitCast;
import com.oracle.truffle.api.dsl.TypeSystem;
import com.oracle.truffle.api.dsl.internal.DSLOptions;

@TypeSystem
@DSLOptions(defaultGenerator = DSLOptions.DSLGenerator.FLAT)
public abstract class RubyTypes {

@ImplicitCast