[Truffle] More privatisation.

jruby · Dec 4, 2016 · 55e5574 · 55e5574
1 parent c15bf67
commit 55e5574
Show file tree

Hide file tree

Showing 48 changed files with 2,767 additions and 81 deletions.
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -46,7 +46,6 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.SafePropertyAccessor;
-import org.jruby.util.cli.Options;
 import org.jruby.util.cli.OutputStrings;
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
@@ -60,7 +59,6 @@
 import java.io.PrintStream;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;

diff --git a/truffle/src/main/java/org/jruby/truffle/Main.java b/truffle/src/main/java/org/jruby/truffle/Main.java
@@ -48,7 +48,7 @@
 import org.jruby.truffle.options.OptionsBuilder;
 import org.jruby.truffle.options.OptionsCatalog;
 import org.jruby.truffle.options.RubyInstanceConfig;
-import org.jruby.util.cli.OutputStrings;
+import org.jruby.truffle.options.OutputStrings;
 
 import java.io.InputStream;
 import java.lang.management.ManagementFactory;

diff --git a/truffle/src/main/java/org/jruby/truffle/cext/CExtNodes.java b/truffle/src/main/java/org/jruby/truffle/cext/CExtNodes.java
@@ -44,7 +44,7 @@
 import org.jruby.truffle.language.control.RaiseException;
 import org.jruby.truffle.language.methods.DeclarationContext;
 import org.jruby.truffle.language.objects.MetaClassNode;
-import org.jruby.util.unsafe.UnsafeHolder;
+import org.jruby.truffle.util.UnsafeHolder;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/Hashing.java b/truffle/src/main/java/org/jruby/truffle/core/Hashing.java
@@ -9,14 +9,12 @@
  */
 package org.jruby.truffle.core;
 
-import org.jruby.util.cli.Options;
-
 import java.util.Random;
 
 public class Hashing {
 
-    private static final boolean SIPHASH_ENABLED = Options.SIPHASH_ENABLED.load();
-    private static final boolean CONSISTENT_HASHING_ENABLED = Options.CONSISTENT_HASHING.load();
+    private static final boolean SIPHASH_ENABLED = false;
+    private static final boolean CONSISTENT_HASHING_ENABLED = false;
 
     private static final int MURMUR2_MAGIC = 0x5bd1e995;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java b/truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java
@@ -49,10 +49,8 @@
 import org.jruby.truffle.builtins.CoreMethodNode;
 import org.jruby.truffle.builtins.YieldingCoreMethodNode;
 import org.jruby.truffle.core.string.StringOperations;
-import org.jruby.util.unsafe.UnsafeHolder;
+import org.jruby.truffle.util.UnsafeHolder;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 @CoreClass("Truffle::System")

diff --git a/truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java
@@ -18,7 +18,7 @@
 import org.jruby.truffle.builtins.CoreClass;
 import org.jruby.truffle.builtins.CoreMethod;
 import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
-import org.jruby.util.Memo;
+import org.jruby.truffle.util.Memo;
 
 @CoreClass("Truffle::Binding")
 public abstract class TruffleBindingNodes {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/LazyDefaultValueNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/LazyDefaultValueNode.java
@@ -17,17 +17,18 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.NotProvided;
 import org.jruby.truffle.language.RubyNode;
-import org.jruby.util.func.Function0;
+
+import java.util.function.Supplier;
 
 @NodeChild(value = "value", type = RubyNode.class)
 public abstract class LazyDefaultValueNode extends RubyNode {
 
-    private final Function0<Object> defaultValueProducer;
+    private final Supplier<Object> defaultValueProducer;
 
     @CompilationFinal private boolean hasDefault;
     @CompilationFinal private Object defaultValue;
 
-    public LazyDefaultValueNode(RubyContext context, SourceSection sourceSection, Function0<Object> defaultValueProducer) {
+    public LazyDefaultValueNode(RubyContext context, SourceSection sourceSection, Supplier<Object> defaultValueProducer) {
         super(context, sourceSection);
         this.defaultValueProducer = defaultValueProducer;
     }
@@ -36,7 +37,7 @@ public LazyDefaultValueNode(RubyContext context, SourceSection sourceSection, Fu
     public Object doDefault(NotProvided value) {
         if (!hasDefault) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            defaultValue = defaultValueProducer.apply();
+            defaultValue = defaultValueProducer.get();
             hasDefault = true;
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java
@@ -26,7 +26,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.printf.PrintfSimpleTreeBuilder;
 import org.jruby.util.ByteList;
-import org.jruby.util.ConvertBytes;
+import org.jruby.truffle.util.ConvertBytes;
 
 import java.math.BigInteger;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java
@@ -57,7 +57,7 @@
 import org.jruby.truffle.core.format.exceptions.InvalidFormatException;
 import org.jruby.truffle.core.format.read.SourceNode;
 import org.jruby.truffle.core.rope.AsciiOnlyLeafRope;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java
@@ -55,7 +55,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.read.SourceNode;
 import org.jruby.truffle.core.rope.AsciiOnlyLeafRope;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java
@@ -55,7 +55,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.read.SourceNode;
 import org.jruby.truffle.core.rope.AsciiOnlyLeafRope;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java
@@ -55,7 +55,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.read.SourceNode;
 import org.jruby.truffle.core.rope.AsciiOnlyLeafRope;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBase64StringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBase64StringNode.java
@@ -18,7 +18,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException;
 import org.jruby.util.ByteList;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteMIMEStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteMIMEStringNode.java
@@ -17,7 +17,7 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.util.ByteList;
-import org.jruby.util.PackUtils;
+import org.jruby.truffle.util.PackUtils;
 
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteUUStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteUUStringNode.java
@@ -18,7 +18,7 @@
 import org.jruby.truffle.core.format.FormatNode;
 import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException;
 import org.jruby.util.ByteList;
-import org.jruby.util.Pack;
+import org.jruby.truffle.util.Pack;
 
 /**
  * Read a string that contains UU-encoded data and write as actual binary

diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java
@@ -37,7 +37,7 @@
 import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.language.methods.UnsupportedOperationBehavior;
-import org.jruby.util.SipHashInline;
+import org.jruby.truffle.util.SipHashInline;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/ClassicRegexp.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/ClassicRegexp.java
@@ -50,8 +50,8 @@
 import org.jruby.truffle.core.string.StringSupport;
 import org.jruby.truffle.parser.ReOptions;
 import org.jruby.util.ByteList;
-import org.jruby.util.collections.WeakValuedMap;
-import org.jruby.util.io.EncodingUtils;
+import org.jruby.truffle.util.WeakValuedMap;
+import org.jruby.truffle.util.EncodingUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
@@ -33,10 +33,10 @@
 import org.jruby.truffle.core.string.StringOperations;
 import org.jruby.truffle.core.string.StringSupport;
 import org.jruby.truffle.language.RubyGuards;
+import org.jruby.truffle.util.EncodingUtils;
+import org.jruby.truffle.util.Memo;
 import org.jruby.truffle.util.StringUtils;
 import org.jruby.util.ByteList;
-import org.jruby.util.Memo;
-import org.jruby.util.io.EncodingUtils;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
@@ -75,7 +75,7 @@
 import org.jruby.truffle.platform.UnsafeGroup;
 import org.jruby.util.ByteList;
 import org.jruby.util.Dir;
-import org.jruby.util.unsafe.UnsafeHolder;
+import org.jruby.truffle.util.UnsafeHolder;
 
 import java.nio.ByteBuffer;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringCodeRangeableWrapper.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringCodeRangeableWrapper.java
@@ -15,9 +15,9 @@
 import org.jruby.truffle.core.encoding.EncodingNodes;
 import org.jruby.truffle.core.rope.CodeRange;
 import org.jruby.truffle.language.RubyGuards;
+import org.jruby.truffle.util.CodeRangeable;
 import org.jruby.truffle.util.StringUtils;
 import org.jruby.util.ByteList;
-import org.jruby.util.CodeRangeable;
 
 public class StringCodeRangeableWrapper implements CodeRangeable {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -145,10 +145,10 @@
 import org.jruby.truffle.language.objects.TaintNode;
 import org.jruby.truffle.language.objects.TaintNodeGen;
 import org.jruby.truffle.platform.posix.TrufflePosix;
+import org.jruby.truffle.util.CodeRangeable;
 import org.jruby.truffle.util.StringUtils;
 import org.jruby.util.ByteList;
-import org.jruby.util.CodeRangeable;
-import org.jruby.util.ConvertDouble;
+import org.jruby.truffle.util.ConvertDouble;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringSupport.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringSupport.java
@@ -32,22 +32,20 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.jcodings.util.IntHash;
 import org.joni.Matcher;
+import org.jruby.truffle.util.ByteListHolder;
+import org.jruby.truffle.util.CodeRangeSupport;
+import org.jruby.truffle.util.CodeRangeable;
 import org.jruby.util.ByteList;
-import org.jruby.util.ByteListHolder;
-import org.jruby.util.CodeRangeSupport;
-import org.jruby.util.CodeRangeable;
-import org.jruby.util.Sprintf;
-import org.jruby.util.collections.IntHashMap;
-import org.jruby.util.io.EncodingUtils;
+import org.jruby.truffle.util.IntHashMap;
 import sun.misc.Unsafe;
+import org.jruby.truffle.util.EncodingUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import static org.jcodings.Encoding.CHAR_INVALID;
-import static org.jruby.RubyEnumerator.enumeratorize;
 
 public final class StringSupport {
     public static final int CR_7BIT_F    = 16;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
@@ -72,7 +72,7 @@
 import org.jruby.truffle.language.objects.ReadObjectFieldNode;
 import org.jruby.truffle.language.objects.ReadObjectFieldNodeGen;
 import org.jruby.truffle.platform.UnsafeGroup;
-import org.jruby.util.Memo;
+import org.jruby.truffle.util.Memo;
 
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;

diff --git a/truffle/src/main/java/org/jruby/truffle/extra/ffi/PointerPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/extra/ffi/PointerPrimitiveNodes.java
@@ -31,7 +31,7 @@
 import org.jruby.truffle.platform.RubiniusTypes;
 import org.jruby.truffle.platform.UnsafeGroup;
 import org.jruby.util.ByteList;
-import org.jruby.util.unsafe.UnsafeHolder;
+import org.jruby.truffle.util.UnsafeHolder;
 
 public abstract class PointerPrimitiveNodes {
     public static final Pointer NULL_POINTER = jnr.ffi.Runtime.getSystemRuntime().getMemoryManager().newOpaquePointer(0);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java b/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java
@@ -31,7 +31,7 @@
 import org.jruby.truffle.language.methods.DeclarationContext;
 import org.jruby.truffle.parser.ParserContext;
 import org.jruby.truffle.parser.TranslatorDriver;
-import org.jruby.util.Memo;
+import org.jruby.truffle.util.Memo;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java b/truffle/src/main/java/org/jruby/truffle/options/ArgumentProcessor.java
@@ -29,10 +29,9 @@
 package org.jruby.truffle.options;
 
 import org.jruby.truffle.core.string.StringSupport;
+import org.jruby.truffle.util.SafePropertyAccessor;
 import org.jruby.util.FileResource;
 import org.jruby.util.JRubyFile;
-import org.jruby.util.SafePropertyAccessor;
-import org.jruby.util.func.Function2;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,6 +42,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.regex.Pattern;
 
 /**
@@ -543,7 +543,7 @@ private void processArgument() {
     }
 
     private void enableDisableFeature(String name, boolean enable) {
-        Function2<Boolean, ArgumentProcessor, Boolean> feature = FEATURES.get(name);
+        BiFunction<ArgumentProcessor, Boolean, Boolean> feature = FEATURES.get(name);
 
         if (feature == null) {
             config.getError().println("warning: unknown argument for --" + (enable ? "enable" : "disable") + ": `" + name + "'");
@@ -740,35 +740,35 @@ private static boolean isPropertySupported(String propertyName) {
         return false;
     }
 
-    private static final Map<String, Function2<Boolean, ArgumentProcessor, Boolean>> FEATURES;
+    private static final Map<String, BiFunction<ArgumentProcessor, Boolean, Boolean>> FEATURES;
 
     static {
-        Map<String, Function2<Boolean, ArgumentProcessor, Boolean>> features = new HashMap<>(12, 1);
-        Function2<Boolean, ArgumentProcessor, Boolean> function2;
+        Map<String, BiFunction<ArgumentProcessor, Boolean, Boolean>> features = new HashMap<>(12, 1);
+        BiFunction<ArgumentProcessor, Boolean, Boolean> function2;
 
-        features.put("all", new Function2<Boolean, ArgumentProcessor, Boolean>() {
+        features.put("all", new BiFunction<ArgumentProcessor, Boolean, Boolean>() {
             public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 // disable all features
-                for (Map.Entry<String, Function2<Boolean, ArgumentProcessor, Boolean>> entry : FEATURES.entrySet()) {
+                for (Map.Entry<String, BiFunction<ArgumentProcessor, Boolean, Boolean>> entry : FEATURES.entrySet()) {
                     if (entry.getKey().equals("all")) continue; // skip self
                     entry.getValue().apply(processor, enable);
                 }
                 return true;
             }
         });
-        features.put("gem", new Function2<Boolean, ArgumentProcessor, Boolean>() {
+        features.put("gem", new BiFunction<ArgumentProcessor, Boolean, Boolean>() {
             public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 processor.config.setDisableGems(!enable);
                 return true;
             }
         });
-        features.put("gems", new Function2<Boolean, ArgumentProcessor, Boolean>() {
+        features.put("gems", new BiFunction<ArgumentProcessor, Boolean, Boolean>() {
             public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 processor.config.setDisableGems(!enable);
                 return true;
             }
         });
-        features.put("frozen-string-literal", function2 = new Function2<Boolean, ArgumentProcessor, Boolean>() {
+        features.put("frozen-string-literal", function2 = new BiFunction<ArgumentProcessor, Boolean, Boolean>() {
             public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 processor.config.setFrozenStringLiteral(enable);
                 return true;

diff --git a/truffle/src/main/java/org/jruby/truffle/options/OutputStrings.java b/truffle/src/main/java/org/jruby/truffle/options/OutputStrings.java
@@ -28,8 +28,7 @@
 import com.headius.options.Option;
 import org.jruby.truffle.util.Constants;
 import org.jruby.truffle.util.Platform;
-import org.jruby.util.SafePropertyAccessor;
-import org.jruby.util.cli.Options;
+import org.jruby.truffle.util.SafePropertyAccessor;
 
 /**
  * Utility methods to generate the command-line output strings for help,
@@ -153,7 +152,7 @@ public static String getVersionString() {
                 SafePropertyAccessor.getProperty("java.vm.version", "Unknown JVM version"),
                 SafePropertyAccessor.getProperty("java.runtime.version", SafePropertyAccessor.getProperty("java.version", "Unknown version")),
                 org.jruby.util.cli.Options.COMPILE_INVOKEDYNAMIC.load() ? " +indy" : "",
-                Options.COMPILE_MODE.load().shouldJIT() ? " +jit" : "",
+                "truffle",
                 Platform.getOSName(),
                 Platform.getArchitecture()
         );