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

Commits on Dec 27, 2015

  1. [Truffle] Add back the factorypath for Eclipse.

    @eregon
    eregon committed Dec 27, 2015
    Copy the full SHA
    9828a0c View commit details

  2. [Truffle] Add missing copyright infos and update them.

    @eregon
    eregon committed Dec 27, 2015
    Copy the full SHA
    9f62c2f View commit details
4 changes: 4 additions & 0 deletions truffle/.factorypath
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<factorypath>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/0.10/truffle-api-0.10.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/0.10/truffle-dsl-processor-0.10.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/format/nodes/read/LiteralIntegerNode.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.format.nodes.read;

import com.oracle.truffle.api.frame.VirtualFrame;
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/LazyRubyRootNode.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.CallTarget;
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/objects/IsANode.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.objects;

import com.oracle.truffle.api.Assumption;
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/array/EmptyArrayMirror.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.array;

public class EmptyArrayMirror extends BasicArrayMirror {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/core/RubyMethodForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved. This
* Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/ffi/LibCClockGetTime.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.ffi;

public interface LibCClockGetTime {
9 changes: 9 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/ffi/TimeSpec.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
* code is released under a tri EPL/GPL/LGPL license. You can use it,
* redistribute it and/or modify it under the terms of the:
*
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.ffi;

import jnr.ffi.Struct;