[Truffle] Organise imports.

jruby · Feb 29, 2016 · e283630 · e283630
1 parent 0e25db2
commit e283630
Showing 7 changed files with 44 additions and 6 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java b/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.vm.PolyglotEngine;
 import org.jruby.JRubyTruffleInterface;
 import org.jruby.Ruby;
-import org.jruby.exceptions.MainExitException;
 import org.jruby.truffle.interop.JRubyContextWrapper;
 import org.jruby.truffle.language.control.ExitException;
 import org.jruby.truffle.platform.Graal;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
@@ -28,7 +28,6 @@
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.RubyRootNode;
-import org.jruby.truffle.language.arguments.CheckArityNode;
 import org.jruby.truffle.language.arguments.MissingArgumentBehavior;
 import org.jruby.truffle.language.arguments.ReadBlockNode;
 import org.jruby.truffle.language.arguments.ReadCallerFrameNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
@@ -65,7 +65,6 @@
 import org.jruby.truffle.language.RubyGuards;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.RubyRootNode;
-import org.jruby.truffle.language.arguments.CheckArityNode;
 import org.jruby.truffle.language.arguments.MissingArgumentBehavior;
 import org.jruby.truffle.language.arguments.ReadPreArgumentNode;
 import org.jruby.truffle.language.arguments.RubyArguments;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java
@@ -26,6 +26,7 @@
 import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.language.methods.UnsupportedOperationBehavior;
+
 import java.math.BigInteger;
 
 @CoreClass(name = "Integer")

diff --git a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java
@@ -30,7 +30,6 @@
 import org.jruby.truffle.core.encoding.EncodingNodes;
 import org.jruby.truffle.core.proc.ProcNodes;
 import org.jruby.truffle.language.RubyRootNode;
-import org.jruby.truffle.language.arguments.CheckArityNode;
 import org.jruby.truffle.language.arguments.RubyArguments;
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.methods.Arity;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/Options.java b/truffle/src/main/java/org/jruby/truffle/language/Options.java
@@ -9,7 +9,49 @@
  */
 package org.jruby.truffle.language;
 
-import static org.jruby.util.cli.Options.*;
+import static org.jruby.util.cli.Options.TRUFFLE_ALLOCATE_CLASS_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_ARRAY_SMALL;
+import static org.jruby.util.cli.Options.TRUFFLE_ARRAY_UNINITIALIZED_SIZE;
+import static org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_HIDE_CORE_FILES;
+import static org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_INTERLEAVE_JAVA;
+import static org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_LIMIT;
+import static org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_OMIT_UNUSED;
+import static org.jruby.util.cli.Options.TRUFFLE_BINDING_LOCAL_VARIABLE_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_BIND_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH;
+import static org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH_WRITE;
+import static org.jruby.util.cli.Options.TRUFFLE_CLASS_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_CONSTANT_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_CORE_ALWAYS_CLONE;
+import static org.jruby.util.cli.Options.TRUFFLE_CORE_LOAD_PATH;
+import static org.jruby.util.cli.Options.TRUFFLE_COVERAGE;
+import static org.jruby.util.cli.Options.TRUFFLE_COVERAGE_GLOBAL;
+import static org.jruby.util.cli.Options.TRUFFLE_DISPATCH_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_ENCODING_COMPATIBLE_QUERY_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_EVAL_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_EXCEPTIONS_PRINT_JAVA;
+import static org.jruby.util.cli.Options.TRUFFLE_EXCEPTIONS_PRINT_UNCAUGHT_JAVA;
+import static org.jruby.util.cli.Options.TRUFFLE_EXCEPTIONS_STORE_JAVA;
+import static org.jruby.util.cli.Options.TRUFFLE_HASH_PACKED_ARRAY_MAX;
+import static org.jruby.util.cli.Options.TRUFFLE_INCLUDE_CORE_FILE_CALLERS_IN_SET_TRACE_FUNC;
+import static org.jruby.util.cli.Options.TRUFFLE_INLINE_NEEDS_CALLER_FRAME;
+import static org.jruby.util.cli.Options.TRUFFLE_INSTANCE_VARIABLE_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_INSTRUMENTATION_SERVER_PORT;
+import static org.jruby.util.cli.Options.TRUFFLE_IS_A_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_METHODMISSING_ALWAYS_CLONE;
+import static org.jruby.util.cli.Options.TRUFFLE_METHODMISSING_ALWAYS_INLINE;
+import static org.jruby.util.cli.Options.TRUFFLE_METHOD_LOOKUP_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_METHOD_TO_PROC_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_PACK_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_PACK_RECOVER_LOOP_MIN;
+import static org.jruby.util.cli.Options.TRUFFLE_PACK_UNROLL_LIMIT;
+import static org.jruby.util.cli.Options.TRUFFLE_PLATFORM_USE_JAVA;
+import static org.jruby.util.cli.Options.TRUFFLE_SYMBOL_TO_PROC_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_THREAD_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_UNPACK_CACHE;
+import static org.jruby.util.cli.Options.TRUFFLE_YIELD_ALWAYS_CLONE;
+import static org.jruby.util.cli.Options.TRUFFLE_YIELD_ALWAYS_INLINE;
+import static org.jruby.util.cli.Options.TRUFFLE_YIELD_CACHE;
 
 public class Options {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java
@@ -10,7 +10,6 @@
 package org.jruby.truffle.language.loader;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.Frame;