Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Feb 5, 2016
2 parents 38756a7 + b79fc41 commit 921a5f4
Showing 530 changed files with 974 additions and 1,060 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ For [`rbenv`](https://github.com/sstephenson/rbenv) you will need the
package manager can provide these. Then you can run:

```
$ rbenv install jruby-9.0.0.0-dev
$ rbenv install jruby-9.0.5.0
```

For [`rvm`](https://rvm.io) you can simply do:
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@
import com.oracle.truffle.api.vm.PolyglotEngine;
import org.jruby.JRubyTruffleInterface;
import org.jruby.Ruby;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.RubyLanguage;

import java.io.IOException;

1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/PolyglotEngineMain.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@

import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.vm.PolyglotEngine;
import org.jruby.truffle.runtime.RubyLanguage;

import java.io.*;
import java.nio.charset.StandardCharsets;
32 changes: 12 additions & 20 deletions ...rg/jruby/truffle/runtime/RubyContext.java → ...n/java/org/jruby/truffle/RubyContext.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;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -29,40 +29,32 @@
import org.jruby.ext.ffi.Platform.OS_TYPE;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.core.*;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.platform.TrufflePOSIXHandler;
import org.jruby.truffle.platform.posix.TruffleJavaPOSIX;
import org.jruby.truffle.tools.InstrumentationServerManager;
import org.jruby.truffle.tools.callgraph.CallGraph;
import org.jruby.truffle.tools.callgraph.SimpleWriter;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.language.control.SequenceNode;
import org.jruby.truffle.core.BindingNodes;
import org.jruby.truffle.core.LoadRequiredLibrariesNode;
import org.jruby.truffle.core.SetTopLevelBindingNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.exceptions.TopLevelRaiseHandler;
import org.jruby.truffle.instrument.RubyDefaultASTProber;
import org.jruby.truffle.language.methods.DeclarationContext;
import org.jruby.truffle.core.rubinius.RubiniusPrimitiveManager;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ArrayOperations;
import org.jruby.truffle.core.CoreLibrary;
import org.jruby.truffle.core.RopeTable;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.SymbolTable;
import org.jruby.truffle.runtime.ffi.LibCClockGetTime;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.loader.FeatureLoader;
import org.jruby.truffle.runtime.loader.SourceCache;
import org.jruby.truffle.runtime.loader.SourceLoader;
import org.jruby.truffle.core.ffi.LibCClockGetTime;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.loader.FeatureLoader;
import org.jruby.truffle.language.loader.SourceCache;
import org.jruby.truffle.language.loader.SourceLoader;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.objects.ObjectIDOperations;
import org.jruby.truffle.platform.darwin.CrtExterns;
import org.jruby.truffle.runtime.rope.Rope;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.platform.RubiniusConfiguration;
import org.jruby.truffle.runtime.sockets.NativeSockets;
import org.jruby.truffle.runtime.subsystems.*;
import org.jruby.truffle.stdlib.sockets.NativeSockets;
import org.jruby.truffle.language.translator.TranslatorDriver;
import org.jruby.truffle.language.translator.TranslatorDriver.ParserContext;
import org.jruby.util.ByteList;
2 changes: 1 addition & 1 deletion ...g/jruby/truffle/runtime/RubyLanguage.java → .../java/org/jruby/truffle/RubyLanguage.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;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/AncestorIterator.java
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.runtime.ModuleChain;
import org.jruby.truffle.language.ModuleChain;

import java.util.Iterator;
import java.util.NoSuchElementException;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/ArrayForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
import org.jruby.truffle.language.InternalRootNode;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.interop.InteropNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.RubyLanguage;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.RubyLanguage;

public class ArrayForeignAccessFactory implements ForeignAccess.Factory10 {
private final RubyContext context;
2 changes: 1 addition & 1 deletion .../truffle/runtime/layouts/ArrayLayout.java → ...a/org/jruby/truffle/core/ArrayLayout.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.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/ArrayOperations.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.array.ArrayReflector;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.runtime.layouts.Layouts;

import java.util.Arrays;

8 changes: 3 additions & 5 deletions ...fle/runtime/subsystems/AtExitManager.java → ...org/jruby/truffle/core/AtExitManager.java
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,13 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.subsystems;
package org.jruby.truffle.core;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.ProcNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.backtrace.BacktraceFormatter;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.backtrace.BacktraceFormatter;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;

import java.util.ArrayList;
import java.util.Deque;
9 changes: 3 additions & 6 deletions ...untime/subsystems/AttachmentsManager.java → ...ruby/truffle/core/AttachmentsManager.java
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
* GNU Lesser General Public License version 2.1
*/

package org.jruby.truffle.runtime.subsystems;
package org.jruby.truffle.core;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.Truffle;
@@ -29,11 +29,8 @@
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.tools.LineToProbesMap;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.BindingNodes;
import org.jruby.truffle.core.ProcNodes;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.RubyLanguage;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.RubyLanguage;

import java.util.HashMap;
import java.util.List;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/BasicForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
import org.jruby.truffle.language.InternalRootNode;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.interop.InteropNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.RubyLanguage;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.RubyLanguage;

public class BasicForeignAccessFactory implements ForeignAccess.Factory10 {

4 changes: 2 additions & 2 deletions ...le/runtime/layouts/BasicObjectLayout.java → ...jruby/truffle/core/BasicObjectLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.object.ObjectType;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;

@Layout(objectTypeSuperclass = "org.jruby.truffle.runtime.RubyObjectType")
@Layout(objectTypeSuperclass = "org.jruby.truffle.language.RubyObjectType")
public interface BasicObjectLayout {

DynamicObjectFactory createBasicObjectShape(@Nullable DynamicObject logicalClass,
7 changes: 3 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/BasicObjectNodes.java
View file
Original file line number Diff line number Diff line change
@@ -32,11 +32,10 @@
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.language.supercall.SuperCallNode;
import org.jruby.truffle.language.yield.YieldDispatchHeadNode;
import org.jruby.truffle.runtime.ModuleOperations;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.language.ModuleOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.language.methods.InternalMethod;

import java.util.Arrays;
2 changes: 1 addition & 1 deletion ...truffle/runtime/layouts/BignumLayout.java → .../org/jruby/truffle/core/BignumLayout.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.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/BignumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -21,10 +21,9 @@
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;

import java.math.BigInteger;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/BinaryCoreMethodNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
import com.oracle.truffle.api.dsl.NodeChildren;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.RubyContext;

@NodeChildren({
@NodeChild(value = "left", type = RubyNode.class),
2 changes: 1 addition & 1 deletion ...ruffle/runtime/layouts/BindingLayout.java → ...org/jruby/truffle/core/BindingLayout.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.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.object.DynamicObject;
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/BindingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,10 +28,9 @@
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.ThreadLocalObject;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.ThreadLocalObject;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;

@CoreClass(name = "Binding")
public abstract class BindingNodes {
3 changes: 1 addition & 2 deletions .../truffle/runtime/layouts/ClassLayout.java → ...a/org/jruby/truffle/core/ClassLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.runtime.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.truffle.core.ModuleFields;

@Layout
public interface ClassLayout extends ModuleLayout {
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/ClassNodes.java
View file
Original file line number Diff line number Diff line change
@@ -23,9 +23,8 @@
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.runtime.NotProvided;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.RubyContext;

@CoreClass(name = "Class")
public abstract class ClassNodes {
12 changes: 5 additions & 7 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -51,17 +51,15 @@
import org.jruby.truffle.core.rubinius.ByteArrayNodesFactory;
import org.jruby.truffle.core.rubinius.PosixNodesFactory;
import org.jruby.truffle.core.rubinius.RubiniusTypeNodesFactory;
import org.jruby.truffle.runtime.RubyCallStack;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.backtrace.BacktraceFormatter;
import org.jruby.truffle.language.RubyCallStack;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.backtrace.BacktraceFormatter;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.control.TruffleFatalException;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.layouts.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.runtime.layouts.ext.DigestLayoutImpl;
import org.jruby.truffle.stdlib.DigestLayoutImpl;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.platform.RubiniusTypes;
import org.jruby.truffle.runtime.signal.SignalOperations;
import org.jruby.truffle.platform.signal.SignalOperations;
import org.jruby.util.cli.OutputStrings;

import java.io.File;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreMethodArrayArgumentsNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.RubyContext;

@NodeChild(value = "arguments", type = RubyNode[].class)
public abstract class CoreMethodArrayArgumentsNode extends CoreMethodNode {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreMethodNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.RubyContext;

@GenerateNodeFactory
public abstract class CoreMethodNode extends RubyNode {
7 changes: 2 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
View file
Original file line number Diff line number Diff line change
@@ -17,19 +17,16 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.*;
import org.jruby.truffle.core.cast.TaintResultNode;
import org.jruby.truffle.language.control.SequenceNode;
import org.jruby.truffle.core.fixnum.FixnumLowerNodeGen;
import org.jruby.truffle.language.methods.ExceptionTranslatingNode;
import org.jruby.truffle.language.objects.SelfNode;
import org.jruby.truffle.language.objects.SingletonClassNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.language.methods.Arity;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.methods.SharedMethodInfo;
2 changes: 1 addition & 1 deletion ...time/layouts/EncodingConverterLayout.java → ...truffle/core/EncodingConverterLayout.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.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/core/EncodingConverterNodes.java
View file
Original file line number Diff line number Diff line change
@@ -26,8 +26,7 @@
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.RubyContext;
import org.jruby.util.ByteList;
import org.jruby.util.io.EncodingUtils;

2 changes: 1 addition & 1 deletion ...uffle/runtime/layouts/EncodingLayout.java → ...rg/jruby/truffle/core/EncodingLayout.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.layouts;
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
Loading

0 comments on commit 921a5f4

Please sign in to comment.