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

Commits on Feb 1, 2016

  1. [Truffle] Move POSIX stuff into a package.

    @chrisseaton
    chrisseaton committed Feb 1, 2016
    Copy the full SHA
    81fa791 View commit details

  2. [Truffle] Move more native stuff.

    @chrisseaton
    chrisseaton committed Feb 1, 2016
    Copy the full SHA
    3f30d52 View commit details

  3. [Truffle] Move ext to the top level.

    @chrisseaton
    chrisseaton committed Feb 1, 2016
    Copy the full SHA
    1fcd102 View commit details
Showing with 43 additions and 35 deletions.
  1. +8 −8 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
  2. +6 −6 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/BigDecimalNodes.java
  3. +1 −1 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/DigestNodes.java
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/EtcNodes.java
  5. +1 −1 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/ObjSpaceNodes.java
  6. +1 −1 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/psych/PsychEmitterNodes.java
  7. +1 −1 truffle/src/main/java/org/jruby/truffle/{nodes → }/ext/psych/PsychParserNodes.java
  8. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/NativeFunctionPrimitiveNodes.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PointerPrimitiveNodes.java
  10. +1 −1 ...e/src/main/java/org/jruby/truffle/{runtime/rubinius → platform}/DefaultRubiniusConfiguration.java
  11. +3 −1 truffle/src/main/java/org/jruby/truffle/{runtime/rubinius → platform}/RubiniusConfiguration.java
  12. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime/rubinius → platform}/RubiniusTypes.java
  13. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime/platform → platform/darwin}/CrtExterns.java
  14. +3 −1 ...main/java/org/jruby/truffle/{runtime/rubinius → platform/darwin}/DarwinRubiniusConfiguration.java
  15. +3 −1 ...c/main/java/org/jruby/truffle/{runtime/rubinius → platform/linux}/LinuxRubiniusConfiguration.java
  16. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime → platform/posix}/BaseLibC.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime → platform/posix}/JavaLibC.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime → platform/posix}/POSIXDelegator.java
  19. +1 −1 truffle/src/main/java/org/jruby/truffle/{runtime → platform/posix}/TruffleJavaFileStat.java
  20. +2 −1 truffle/src/main/java/org/jruby/truffle/{runtime → platform/posix}/TruffleJavaPOSIX.java
  21. +3 −2 truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  22. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/layouts/ext/BigDecimalLayout.java
16 changes: 8 additions & 8 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -36,13 +36,13 @@
import org.jruby.truffle.core.array.ArrayNodesFactory;
import org.jruby.truffle.core.fixnum.FixnumNodesFactory;
import org.jruby.truffle.core.hash.HashNodesFactory;
import org.jruby.truffle.nodes.ext.BigDecimalNodesFactory;
import org.jruby.truffle.nodes.ext.DigestNodesFactory;
import org.jruby.truffle.nodes.ext.EtcNodesFactory;
import org.jruby.truffle.nodes.ext.ObjSpaceNodesFactory;
import org.jruby.truffle.nodes.ext.psych.PsychEmitterNodesFactory;
import org.jruby.truffle.nodes.ext.psych.PsychParserNodes;
import org.jruby.truffle.nodes.ext.psych.PsychParserNodesFactory;
import org.jruby.truffle.ext.BigDecimalNodesFactory;
import org.jruby.truffle.ext.DigestNodesFactory;
import org.jruby.truffle.ext.EtcNodesFactory;
import org.jruby.truffle.ext.ObjSpaceNodesFactory;
import org.jruby.truffle.ext.psych.PsychEmitterNodesFactory;
import org.jruby.truffle.ext.psych.PsychParserNodes;
import org.jruby.truffle.ext.psych.PsychParserNodesFactory;
import org.jruby.truffle.nodes.objects.FreezeNode;
import org.jruby.truffle.nodes.objects.FreezeNodeGen;
import org.jruby.truffle.nodes.objects.SingletonClassNode;
@@ -60,7 +60,7 @@
import org.jruby.truffle.runtime.layouts.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.runtime.layouts.ext.DigestLayoutImpl;
import org.jruby.truffle.runtime.methods.InternalMethod;
import org.jruby.truffle.runtime.rubinius.RubiniusTypes;
import org.jruby.truffle.platform.RubiniusTypes;
import org.jruby.truffle.runtime.signal.SignalOperations;
import org.jruby.util.cli.OutputStrings;

12 changes: 6 additions & 6 deletions ...by/truffle/nodes/ext/BigDecimalNodes.java → ...rg/jruby/truffle/ext/BigDecimalNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.ext;
package org.jruby.truffle.ext;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -35,10 +35,10 @@
import org.jruby.truffle.core.*;
import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.nodes.ext.BigDecimalNodesFactory.BigDecimalCastNodeGen;
import org.jruby.truffle.nodes.ext.BigDecimalNodesFactory.BigDecimalCoerceNodeGen;
import org.jruby.truffle.nodes.ext.BigDecimalNodesFactory.CreateBigDecimalNodeFactory;
import org.jruby.truffle.nodes.ext.BigDecimalNodesFactory.GetIntegerConstantNodeGen;
import org.jruby.truffle.ext.BigDecimalNodesFactory.BigDecimalCastNodeGen;
import org.jruby.truffle.ext.BigDecimalNodesFactory.BigDecimalCoerceNodeGen;
import org.jruby.truffle.ext.BigDecimalNodesFactory.CreateBigDecimalNodeFactory;
import org.jruby.truffle.ext.BigDecimalNodesFactory.GetIntegerConstantNodeGen;
import org.jruby.truffle.nodes.internal.UnreachableCodeBranch;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
@@ -235,7 +235,7 @@ public BigDecimalCoreMethodArrayArgumentsNode(RubyContext context, SourceSection
@NodeChild(value = "self", type = RubyNode.class),
@NodeChild(value = "digits", type = RubyNode.class)
})
@ImportStatic(org.jruby.truffle.nodes.ext.BigDecimalNodes.Type.class)
@ImportStatic(org.jruby.truffle.ext.BigDecimalNodes.Type.class)
public abstract static class CreateBigDecimalNode extends BigDecimalCoreMethodNode {

private final static Pattern NUMBER_PATTERN;
2 changes: 1 addition & 1 deletion .../jruby/truffle/nodes/ext/DigestNodes.java → ...va/org/jruby/truffle/ext/DigestNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.ext;
package org.jruby.truffle.ext;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
2 changes: 1 addition & 1 deletion ...org/jruby/truffle/nodes/ext/EtcNodes.java → .../java/org/jruby/truffle/ext/EtcNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.ext;
package org.jruby.truffle.ext;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
2 changes: 1 addition & 1 deletion ...ruby/truffle/nodes/ext/ObjSpaceNodes.java → .../org/jruby/truffle/ext/ObjSpaceNodes.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.nodes.ext;
package org.jruby.truffle.ext;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.Specialization;
2 changes: 1 addition & 1 deletion ...le/nodes/ext/psych/PsychEmitterNodes.java → .../truffle/ext/psych/PsychEmitterNodes.java
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the EPL, the GPL or the LGPL.
*/
package org.jruby.truffle.nodes.ext.psych;
package org.jruby.truffle.ext.psych;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.Specialization;
2 changes: 1 addition & 1 deletion ...fle/nodes/ext/psych/PsychParserNodes.java → ...y/truffle/ext/psych/PsychParserNodes.java
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the EPL, the GPL or the LGPL.
*/
package org.jruby.truffle.nodes.ext.psych;
package org.jruby.truffle.ext.psych;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/NativeFunctionPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.rubinius.RubiniusTypes;
import org.jruby.truffle.platform.RubiniusTypes;

public abstract class NativeFunctionPrimitiveNodes {

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PointerPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.rope.Rope;
import org.jruby.truffle.runtime.rubinius.RubiniusTypes;
import org.jruby.truffle.platform.RubiniusTypes;
import org.jruby.util.ByteList;
import org.jruby.util.unsafe.UnsafeHolder;

2 changes: 1 addition & 1 deletion ...ubinius/DefaultRubiniusConfiguration.java → ...latform/DefaultRubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jruby.truffle.runtime.rubinius;
package org.jruby.truffle.platform;

import com.oracle.truffle.api.object.DynamicObject;
import jnr.constants.platform.Fcntl;
4 changes: 3 additions & 1 deletion ...ntime/rubinius/RubiniusConfiguration.java → ...uffle/platform/RubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jruby.truffle.runtime.rubinius;
package org.jruby.truffle.platform;

import org.jruby.ext.ffi.Platform;
import org.jruby.truffle.platform.darwin.DarwinRubiniusConfiguration;
import org.jruby.truffle.platform.linux.LinuxRubiniusConfiguration;
import org.jruby.truffle.runtime.RubyContext;

import java.util.ArrayList;
2 changes: 1 addition & 1 deletion ...uffle/runtime/rubinius/RubiniusTypes.java → ...jruby/truffle/platform/RubiniusTypes.java
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jruby.truffle.runtime.rubinius;
package org.jruby.truffle.platform;

public abstract class RubiniusTypes {

2 changes: 1 addition & 1 deletion .../truffle/runtime/platform/CrtExterns.java → ...y/truffle/platform/darwin/CrtExterns.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.platform;
package org.jruby.truffle.platform.darwin;

import jnr.ffi.Pointer;

4 changes: 3 additions & 1 deletion ...rubinius/DarwinRubiniusConfiguration.java → ...m/darwin/DarwinRubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jruby.truffle.runtime.rubinius;
package org.jruby.truffle.platform.darwin;

import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.platform.DefaultRubiniusConfiguration;
import org.jruby.truffle.platform.RubiniusConfiguration;

public class DarwinRubiniusConfiguration extends DefaultRubiniusConfiguration {

4 changes: 3 additions & 1 deletion .../rubinius/LinuxRubiniusConfiguration.java → ...orm/linux/LinuxRubiniusConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,11 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.jruby.truffle.runtime.rubinius;
package org.jruby.truffle.platform.linux;

import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.platform.DefaultRubiniusConfiguration;
import org.jruby.truffle.platform.RubiniusConfiguration;

public class LinuxRubiniusConfiguration extends DefaultRubiniusConfiguration {

2 changes: 1 addition & 1 deletion ...a/org/jruby/truffle/runtime/BaseLibC.java → ...ruby/truffle/platform/posix/BaseLibC.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime;
package org.jruby.truffle.platform.posix;

import jnr.constants.platform.Sysconf;
import jnr.ffi.Pointer;
2 changes: 1 addition & 1 deletion ...a/org/jruby/truffle/runtime/JavaLibC.java → ...ruby/truffle/platform/posix/JavaLibC.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime;
package org.jruby.truffle.platform.posix;

import jnr.posix.LibC;

2 changes: 1 addition & 1 deletion ...jruby/truffle/runtime/POSIXDelegator.java → ...ruffle/platform/posix/POSIXDelegator.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime;
package org.jruby.truffle.platform.posix;

import jnr.constants.platform.Fcntl;
import jnr.constants.platform.Signal;
2 changes: 1 addition & 1 deletion .../truffle/runtime/TruffleJavaFileStat.java → ...e/platform/posix/TruffleJavaFileStat.java
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime;
package org.jruby.truffle.platform.posix;

import jnr.posix.FileStat;
import jnr.posix.JavaFileStat;
3 changes: 2 additions & 1 deletion ...uby/truffle/runtime/TruffleJavaPOSIX.java → ...ffle/platform/posix/TruffleJavaPOSIX.java
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,15 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime;
package org.jruby.truffle.platform.posix;

import jnr.constants.platform.Errno;
import jnr.constants.platform.Fcntl;
import jnr.constants.platform.OpenFlags;
import jnr.posix.FileStat;
import jnr.posix.LibC;
import jnr.posix.POSIX;
import org.jruby.truffle.runtime.RubyContext;

import java.io.FileNotFoundException;
import java.io.IOException;
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.platform.posix.TruffleJavaPOSIX;
import org.jruby.truffle.tools.callgraph.CallGraph;
import org.jruby.truffle.tools.callgraph.SimpleWriter;
import org.jruby.truffle.nodes.RubyGuards;
@@ -57,9 +58,9 @@
import org.jruby.truffle.runtime.loader.SourceLoader;
import org.jruby.truffle.runtime.methods.InternalMethod;
import org.jruby.truffle.runtime.object.ObjectIDOperations;
import org.jruby.truffle.runtime.platform.CrtExterns;
import org.jruby.truffle.platform.darwin.CrtExterns;
import org.jruby.truffle.runtime.rope.Rope;
import org.jruby.truffle.runtime.rubinius.RubiniusConfiguration;
import org.jruby.truffle.platform.RubiniusConfiguration;
import org.jruby.truffle.runtime.sockets.NativeSockets;
import org.jruby.truffle.runtime.subsystems.*;
import org.jruby.truffle.language.translator.TranslatorDriver;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/layouts/ext/BigDecimalLayout.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.nodes.ext.BigDecimalNodes;
import org.jruby.truffle.ext.BigDecimalNodes;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.runtime.layouts.BasicObjectLayout;