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

Commits on Feb 19, 2015

  1. [Truffle] Update factory path for truffle-head.

    @eregon
    eregon committed Feb 19, 2015
    Copy the full SHA
    cc3ec15 View commit details

  2. [Truffle] Fix API problem.

    @eregon
    eregon committed Feb 19, 2015
    Copy the full SHA
    3f9dc05 View commit details
4 changes: 2 additions & 2 deletions truffle/.factorypath
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<factorypath>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/0.6/truffle-0.6.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle-dsl-processor/0.6/truffle-dsl-processor-0.6.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/0.7-SNAPSHOT/truffle-0.7-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle-dsl-processor/0.7-SNAPSHOT/truffle-dsl-processor-0.7-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetClassNode.java
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ public Object execute(VirtualFrame frame) {
// Look for a current definition of the class, or create a new one

RubyModule lexicalParent = getLexicalParentModule(frame);
final RubyConstant constant = lookupForExistingModule(frame, lexicalParent);
final RubyConstant constant = lookupForExistingModule(lexicalParent);

RubyClass definingClass;
RubyClass superClassObject = getRubySuperClass(frame, context);
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetModuleNode.java
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ public Object execute(VirtualFrame frame) {
// Look for a current definition of the module, or create a new one

RubyModule lexicalParent = getLexicalParentModule(frame);
final RubyConstant constant = lookupForExistingModule(frame, lexicalParent);
final RubyConstant constant = lookupForExistingModule(lexicalParent);

RubyModule definingModule;

@@ -73,7 +73,7 @@ protected RubyModule getLexicalParentModule(VirtualFrame frame) {
}

@TruffleBoundary
protected RubyConstant lookupForExistingModule(VirtualFrame frame, RubyModule lexicalParent) {
protected RubyConstant lookupForExistingModule(RubyModule lexicalParent) {
RubyConstant constant = lexicalParent.getConstants().get(name);

final RubyClass objectClass = getContext().getCoreLibrary().getObjectClass();