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

Commits on Dec 15, 2014

  1. [Truffle] Set TOPLEVEL_BINDING only once.

    @eregon
    eregon committed Dec 15, 2014
    Copy the full SHA
    77ced19 View commit details

  2. [Truffle] Set the simpler constants first before IO.

    @eregon
    eregon committed Dec 15, 2014
    Copy the full SHA
    1205b29 View commit details

  3. Eclipse: remove all Eclipse files from repository 

    * Configuration is easily done via integrated Maven support.
  (Import => Existing Maven project)
    @eregon
    eregon committed Dec 15, 2014
    Copy the full SHA
    156c62d View commit details
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -93,6 +93,9 @@ nbproject/private

# Eclipse project files
/.metadata
core/.classpath
core/.project
core/.settings

# Truffle benchmark stuff
reference.txt
53 changes: 0 additions & 53 deletions core/.classpath
View file

This file was deleted.

14 changes: 0 additions & 14 deletions core/.project
View file

This file was deleted.

4 changes: 0 additions & 4 deletions core/.settings/org.eclipse.jdt.apt.core.prefs
View file

This file was deleted.

18 changes: 0 additions & 18 deletions core/.settings/org.eclipse.jdt.core.prefs
View file

This file was deleted.

60 changes: 0 additions & 60 deletions core/.settings/org.eclipse.jdt.ui.prefs
View file

This file was deleted.

8 changes: 7 additions & 1 deletion core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
View file
Original file line number Diff line number Diff line change
@@ -13,10 +13,12 @@
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.TruffleBridge;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.TopLevelRaiseHandler;
import org.jruby.truffle.nodes.control.SequenceNode;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.RubyContext;
@@ -143,7 +145,11 @@ public Object execute(final TranslatorDriver.ParserContext parserContext, final
return truffleContext.execute(truffleContext, source, parserContext, self, parentFrame, null, new NodeWrapper() {
@Override
public RubyNode wrap(RubyNode node) {
return new TopLevelRaiseHandler(node.getContext(), node.getSourceSection(), node);
RubyContext context = node.getContext();
SourceSection sourceSection = node.getSourceSection();
return SequenceNode.sequence(context, sourceSection,
new SetTopLevelBindingNode(context, sourceSection),
new TopLevelRaiseHandler(context, sourceSection, node));
}
});
}
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
View file
Original file line number Diff line number Diff line change
@@ -186,10 +186,6 @@ public RubyRootNode parse(RubyNode currentNode, RubyContext context, Source sour

truffleNode = wrapper.wrap(truffleNode);

// Binding

truffleNode = SequenceNode.sequence(context, sourceSection, new SetTopLevelBindingNode(context, sourceSection), truffleNode);

// Shell result

return new RubyRootNode(context, truffleNode.getSourceSection(), environment.getFrameDescriptor(), sharedMethodInfo, truffleNode);
8 changes: 4 additions & 4 deletions core/src/main/ruby/jruby/truffle/core/main.rb
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

NIL = nil
TRUE = true
FALSE = false

module STDIN
def self.external_encoding
@external || Encoding.default_external
@@ -66,7 +70,3 @@ def self.set_encoding(external, internal)
end

ARGF = Object.new

NIL = nil
TRUE = true
FALSE = false