Skip to content

Commit

Permalink
[Truffle] Organise imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisseaton
chrisseaton committed Nov 18, 2016
1 parent 7063ced commit 525010e
Show file tree
Hide file tree
Showing 27 changed files with 23 additions and 59 deletions.
6 changes: 0 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
View file
Expand Up @@ -9,14 +9,8 @@
*/
package org.jruby.truffle;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.vm.PolyglotEngine;
import org.jruby.JRubyTruffleInterface;
import org.jruby.RubyInstanceConfig;
import org.jruby.truffle.interop.InstanceConfigWrapper;
import org.jruby.truffle.platform.graal.Graal;
import org.jruby.util.cli.Options;

import java.io.InputStream;

Expand Down
3 changes: 0 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/Main.java
View file
Expand Up @@ -49,9 +49,6 @@
import org.jruby.util.cli.Options;
import org.jruby.util.cli.OutputStrings;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;

Expand Down
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java
View file
Expand Up @@ -13,9 +13,6 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;

import java.util.Set;

import org.jcodings.Encoding;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.ext.rbconfig.RbConfigLibrary;
Expand All @@ -26,6 +23,8 @@
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.util.unsafe.UnsafeHolder;

import java.util.Set;

@CoreClass("Truffle::System")
public abstract class TruffleSystemNodes {

Expand Down
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/hash/CompareHashKeysNode.java
View file
Expand Up @@ -9,15 +9,14 @@
*/
package org.jruby.truffle.core.hash;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import org.jruby.truffle.core.basicobject.BasicObjectNodes.ReferenceEqualNode;
import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory.ReferenceEqualNodeFactory;
import org.jruby.truffle.core.kernel.KernelNodes.SameOrEqlNode;
import org.jruby.truffle.core.kernel.KernelNodesFactory.SameOrEqlNodeFactory;
import org.jruby.truffle.language.RubyBaseNode;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;

public class CompareHashKeysNode extends RubyBaseNode {

@Child private SameOrEqlNode sameOrEqlNode;
Expand Down
11 changes: 5 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/hash/FreezeHashKeyIfNeededNode.java
View file
Expand Up @@ -9,18 +9,17 @@
*/
package org.jruby.truffle.core.hash;

import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.language.objects.IsFrozenNode;
import org.jruby.truffle.language.objects.IsFrozenNodeGen;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.NodeChildren;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.language.objects.IsFrozenNode;
import org.jruby.truffle.language.objects.IsFrozenNodeGen;

@NodeChildren({@NodeChild("key"), @NodeChild("compareByIdentity")})
public abstract class FreezeHashKeyIfNeededNode extends RubyNode {
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/hash/HashNode.java
View file
Expand Up @@ -12,7 +12,6 @@
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ConditionProfile;

import org.jruby.truffle.core.ObjectNodes.ObjectIDPrimitiveNode;
import org.jruby.truffle.core.ObjectNodesFactory.ObjectIDPrimitiveNodeFactory;
import org.jruby.truffle.language.RubyBaseNode;
Expand Down
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java
View file
Expand Up @@ -9,12 +9,11 @@
*/
package org.jruby.truffle.core.hash;

import org.jruby.truffle.Layouts;
import org.jruby.truffle.language.RubyBaseNode;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.Layouts;
import org.jruby.truffle.language.RubyBaseNode;

public class LookupEntryNode extends RubyBaseNode {

Expand Down
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java
View file
Expand Up @@ -9,9 +9,6 @@
*/
package org.jruby.truffle.core.hash;

import org.jruby.truffle.Layouts;
import org.jruby.truffle.language.RubyNode;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.ImportStatic;
Expand All @@ -23,6 +20,8 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.Layouts;
import org.jruby.truffle.language.RubyNode;

@ImportStatic(HashGuards.class)
@NodeChildren({
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
View file
Expand Up @@ -68,7 +68,6 @@
import org.jruby.truffle.core.cast.ToPathNodeGen;
import org.jruby.truffle.core.cast.ToStrNode;
import org.jruby.truffle.core.cast.ToStrNodeGen;
import org.jruby.truffle.core.encoding.EncodingOperations;
import org.jruby.truffle.core.format.BytesResult;
import org.jruby.truffle.core.format.FormatExceptionTranslator;
import org.jruby.truffle.core.format.exceptions.FormatException;
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/AsciiOnlyLeafRope.java
View file
Expand Up @@ -10,7 +10,6 @@

package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import org.jcodings.Encoding;

public class AsciiOnlyLeafRope extends LeafRope {
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/ConcatRope.java
View file
Expand Up @@ -9,7 +9,6 @@
*/
package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import org.jcodings.Encoding;

Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/InvalidLeafRope.java
View file
Expand Up @@ -10,7 +10,6 @@

package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import org.jcodings.Encoding;

public class InvalidLeafRope extends LeafRope {
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/LazyIntRope.java
View file
Expand Up @@ -9,7 +9,6 @@
*/
package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;

Expand Down
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
View file
Expand Up @@ -21,7 +21,6 @@
*/
package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.Encoding;
Expand All @@ -33,7 +32,6 @@
import org.jruby.truffle.core.encoding.EncodingManager;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.util.StringUtils;
import org.jruby.util.ByteList;
import org.jruby.util.Memo;
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/SubstringRope.java
View file
Expand Up @@ -10,7 +10,6 @@

package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import org.jcodings.Encoding;

public class SubstringRope extends Rope {
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/rope/ValidLeafRope.java
View file
Expand Up @@ -10,7 +10,6 @@

package org.jruby.truffle.core.rope;

import com.oracle.truffle.api.CompilerDirectives;
import org.jcodings.Encoding;

public class ValidLeafRope extends LeafRope {
Expand Down
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java
View file
Expand Up @@ -33,7 +33,6 @@
*/
package org.jruby.truffle.core.string;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.Encoding;
Expand All @@ -46,7 +45,6 @@
import org.jruby.truffle.core.rope.RopeOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.util.ByteListUtils;
import org.jruby.truffle.util.StringUtils;
import org.jruby.util.ByteList;

import java.nio.ByteBuffer;
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
View file
Expand Up @@ -50,7 +50,6 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.source.SourceSection;

import org.jcodings.specific.USASCIIEncoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.Layouts;
Expand Down
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/time/RubyDateFormatter.java
View file
Expand Up @@ -42,8 +42,8 @@
import jnr.constants.platform.Errno;
import org.jcodings.Encoding;
import org.jcodings.specific.ASCIIEncoding;
import org.joda.time.DateTime;
import org.joda.time.Chronology;
import org.joda.time.DateTime;
import org.joda.time.chrono.GJChronology;
import org.joda.time.chrono.JulianChronology;
import org.jruby.truffle.RubyContext;
Expand Down
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java
View file
Expand Up @@ -20,7 +20,6 @@
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.source.SourceSection;
import com.sun.security.auth.module.UnixSystem;

import jnr.constants.platform.Fcntl;
import jnr.ffi.Pointer;
import org.jcodings.specific.UTF8Encoding;
Expand All @@ -36,7 +35,6 @@
import org.jruby.truffle.extra.ffi.PointerPrimitiveNodes;
import org.jruby.truffle.language.SnippetNode;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.platform.UnsafeGroup;
import org.jruby.truffle.platform.signal.Signal;

Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/interop/InstanceConfigWrapper.java
View file
Expand Up @@ -11,7 +11,6 @@

import com.oracle.truffle.api.interop.ForeignAccess;
import com.oracle.truffle.api.interop.TruffleObject;
import org.jruby.Ruby;
import org.jruby.RubyInstanceConfig;

public class InstanceConfigWrapper implements TruffleObject {
Expand Down
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/language/globals/AliasGlobalVarNode.java
View file
Expand Up @@ -10,9 +10,8 @@

package org.jruby.truffle.language.globals;

import org.jruby.truffle.language.RubyNode;

import com.oracle.truffle.api.frame.VirtualFrame;
import org.jruby.truffle.language.RubyNode;

public class AliasGlobalVarNode extends RubyNode {

Expand Down
3 changes: 1 addition & 2 deletions ...ain/java/org/jruby/truffle/platform/openjdk/OpenJDKArrayBlockingQueueLocksConditions.java
View file
Expand Up @@ -9,12 +9,11 @@
*/
package org.jruby.truffle.platform.openjdk;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import org.jruby.truffle.core.queue.ArrayBlockingQueueLocksConditions;
import org.jruby.truffle.core.queue.DelegatingBlockingQueue;
import org.jruby.truffle.language.control.JavaException;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

import java.lang.invoke.MethodHandle;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.locks.Condition;
Expand Down
5 changes: 2 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java
View file
Expand Up @@ -9,6 +9,8 @@
*/
package org.jruby.truffle.platform.posix;

import com.kenai.jffi.Platform;
import com.kenai.jffi.Platform.OS;
import jnr.constants.platform.Fcntl;
import jnr.constants.platform.Signal;
import jnr.constants.platform.Sysconf;
Expand All @@ -21,9 +23,6 @@
import jnr.posix.Times;
import org.jruby.truffle.core.CoreLibrary;

import com.kenai.jffi.Platform;
import com.kenai.jffi.Platform.OS;

import java.io.FileDescriptor;
import java.nio.ByteBuffer;
import java.util.Collection;
Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/platform/posix/PosixFDSet4Bytes.java
View file
Expand Up @@ -11,7 +11,6 @@
package org.jruby.truffle.platform.posix;

import jnr.ffi.Pointer;

import org.jruby.truffle.platform.FDSet;
import org.jruby.truffle.util.StringUtils;

Expand Down
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/platform/posix/PosixFDSet8Bytes.java
View file
Expand Up @@ -11,7 +11,6 @@
package org.jruby.truffle.platform.posix;

import jnr.ffi.Pointer;

import org.jruby.truffle.platform.FDSet;
import org.jruby.truffle.util.StringUtils;

Expand Down
11 changes: 5 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/platform/solaris/SolarisPlatform.java
View file
Expand Up @@ -9,6 +9,11 @@
*/
package org.jruby.truffle.platform.solaris;

import jnr.ffi.LibraryLoader;
import jnr.ffi.Runtime;
import jnr.ffi.provider.MemoryManager;
import jnr.posix.POSIX;
import jnr.posix.POSIXFactory;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.queue.ArrayBlockingQueueLocksConditions;
import org.jruby.truffle.core.queue.LinkedBlockingQueueLocksConditions;
Expand All @@ -29,12 +34,6 @@
import org.jruby.truffle.platform.signal.SignalManager;
import org.jruby.truffle.platform.sunmisc.SunMiscSignalManager;

import jnr.ffi.LibraryLoader;
import jnr.ffi.Runtime;
import jnr.ffi.provider.MemoryManager;
import jnr.posix.POSIX;
import jnr.posix.POSIXFactory;

public class SolarisPlatform implements NativePlatform {

private final TrufflePosix posix;
Expand Down

0 comments on commit 525010e

Please sign in to comment.