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

Commits on Jan 3, 2015

  1. [Truffle] Remove old 'truffelized' method.

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    cf723ce View commit details

  2. [Truffle] Don't need full interop in truffle-head yet.

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    0679c9f View commit details

  3. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    432d579 View commit details
1 change: 0 additions & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@
jar 'com.jcraft:jzlib:1.1.3'
jar 'com.martiansoftware:nailgun-server:0.9.1'
jar 'com.oracle:truffle:0.7-SNAPSHOT'
jar 'com.oracle:truffle-interop:0.7-SNAPSHOT'
jar 'com.oracle:truffle-dsl-processor:0.7-SNAPSHOT', :scope => 'provided'
jar 'junit:junit', :scope => 'test'
jar 'org.apache.ant:ant:${ant.version}', :scope => 'provided'
5 changes: 0 additions & 5 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -198,11 +198,6 @@
<artifactId>truffle</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>truffle-interop</artifactId>
<version>0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>truffle-dsl-processor</artifactId>
6 changes: 0 additions & 6 deletions core/src/main/java/org/jruby/TruffleBridge.java
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,7 @@
package org.jruby;

import com.oracle.truffle.api.frame.MaterializedFrame;
import org.jruby.ast.ArgsNode;
import org.jruby.ast.Node;
import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.TruffleMethod;
import org.jruby.truffle.translator.TranslatorDriver;

public interface TruffleBridge {
@@ -29,8 +25,6 @@ enum BacktraceFormatter {

Object execute(TranslatorDriver.ParserContext parserContext, Object self, MaterializedFrame parentFrame, org.jruby.ast.RootNode rootNode);

IRubyObject toJRuby(Object object);

Object toTruffle(IRubyObject object);

void shutdown();
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
View file
Original file line number Diff line number Diff line change
@@ -184,11 +184,6 @@ public RubyNode wrap(RubyNode node) {
return truffleContext.getCoreLibrary().getNilObject();
}

@Override
public IRubyObject toJRuby(Object object) {
return truffleContext.toJRuby(object);
}

@Override
public Object toTruffle(IRubyObject object) {
return truffleContext.toTruffle(object);
50 changes: 0 additions & 50 deletions core/src/main/java/org/jruby/truffle/TruffleMethod.java
View file

This file was deleted.

14 changes: 5 additions & 9 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -10,25 +10,21 @@
package org.jruby.truffle.nodes.dispatch;

import com.oracle.truffle.api.Assumption;
import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.interop.messages.Read;
import com.oracle.truffle.interop.node.ForeignObjectAccessNode;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyConstant;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyClass;
import org.jruby.truffle.runtime.core.RubyModule;
import org.jruby.truffle.runtime.core.RubySymbol;
import org.jruby.truffle.runtime.methods.RubyMethod;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.util.cli.Options;

import java.io.PrintStream;

public final class UnresolvedDispatchNode extends DispatchNode {

private int depth = 0;
16 changes: 0 additions & 16 deletions core/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -9,20 +9,9 @@
*/
package org.jruby.truffle.runtime.core;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.interop.ForeignAccessArguments;
import com.oracle.truffle.api.interop.ForeignAccessFactory;
import com.oracle.truffle.api.interop.InteropPredicate;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.source.NullSourceSection;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.nodes.core.ArrayAllocationSite;
import org.jruby.truffle.nodes.objects.Allocator;
import org.jruby.truffle.runtime.RubyContext;
@@ -290,9 +279,4 @@ public RubyBasicObject allocate(RubyContext context, RubyClass rubyClass, RubyNo
}

}

@Override
public ForeignAccessFactory getForeignAccessFactory() {
throw new UnsupportedOperationException();
}
}