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 921a5f4 + fc412c1 commit 71bf571
Showing 87 changed files with 218 additions and 168 deletions.
3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.rope.RopeTable;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.platform.TrufflePOSIXHandler;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/BasicObjectNodes.java
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@
import com.oracle.truffle.api.source.SourceSection;

import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/BindingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.locals.ReadFrameSlotNode;
import org.jruby.truffle.language.locals.ReadFrameSlotNodeGen;
4 changes: 4 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,10 @@
import org.jruby.ext.ffi.Platform.OS_TYPE;
import org.jruby.runtime.Constants;
import org.jruby.runtime.encoding.EncodingService;
import org.jruby.truffle.core.regexp.MatchDataNodesFactory;
import org.jruby.truffle.core.regexp.RegexpNodesFactory;
import org.jruby.truffle.core.string.StringNodesFactory;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.array.ArrayNodes;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/EncodingNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
import org.jcodings.specific.UTF8Encoding;
import org.jcodings.util.CaseInsensitiveBytesHash;
import org.jcodings.util.Hash;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.coerce.ToStrNode;
import org.jruby.truffle.core.coerce.ToStrNodeGen;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ExceptionNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.language.objects.ReadHeadObjectFieldNode;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/InterpolatedRegexpNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.regexp.RegexpNodes;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@
import org.jruby.truffle.core.format.parser.PrintfCompiler;
import org.jruby.truffle.core.format.runtime.PackResult;
import org.jruby.truffle.core.format.runtime.exceptions.*;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen;
11 changes: 10 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/Layouts.java
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,16 @@
package org.jruby.truffle.core;

import com.oracle.truffle.api.object.HiddenKey;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.array.ArrayLayout;
import org.jruby.truffle.core.array.ArrayLayoutImpl;
import org.jruby.truffle.core.hash.HashLayout;
import org.jruby.truffle.core.hash.HashLayoutImpl;
import org.jruby.truffle.core.regexp.MatchDataLayout;
import org.jruby.truffle.core.regexp.MatchDataLayoutImpl;
import org.jruby.truffle.core.regexp.RegexpLayout;
import org.jruby.truffle.core.regexp.RegexpLayoutImpl;
import org.jruby.truffle.core.string.StringLayout;
import org.jruby.truffle.core.string.StringLayoutImpl;
import org.jruby.truffle.stdlib.BigDecimalLayout;
import org.jruby.truffle.stdlib.BigDecimalLayoutImpl;
import org.jruby.truffle.stdlib.psych.EmitterLayout;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/LoadRequiredLibrariesNode.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/MethodNodes.java
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.core.cast.ProcOrNullNode;
4 changes: 4 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,10 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.string.StringNodes;
import org.jruby.truffle.core.string.StringNodesFactory;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.language.arguments.CheckArityNode;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ProcNodes.java
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/SymbolTable.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.rope.RopeOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.util.ByteList;

import java.lang.ref.WeakReference;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/ThreadBacktraceLocationNodes.java
View file
Original file line number Diff line number Diff line change
@@ -15,9 +15,9 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.backtrace.Activation;
import org.jruby.truffle.language.backtrace.BacktraceFormatter;
import org.jruby.truffle.core.ThreadBacktraceLocationLayoutImpl;

@CoreClass(name = "Thread::Backtrace::Location")
public class ThreadBacktraceLocationNodes {
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/TimeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
import org.jcodings.specific.UTF8Encoding;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/TraceManager.java
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.RubyContext;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/TruffleInteropNodes.java
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.StringCachingGuards;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.rope.Rope;
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/TrufflePrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,9 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.RubyGC;
import org.jruby.ext.rbconfig.RbConfigLibrary;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.rope.*;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.RubyCallStack;
@@ -39,9 +42,6 @@
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.hash.BucketsStrategy;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.core.rope.CodeRange;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.rope.RopeOperations;
import org.jruby.truffle.tools.SimpleShell;
import org.jruby.util.ByteList;
import org.jruby.util.Memo;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/UnboundMethodNodes.java
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.methods.CanBindMethodToModuleNode;
import org.jruby.truffle.language.methods.CanBindMethodToModuleNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.ArrayOperations;
import org.jruby.truffle.core.Layouts;

/*
2 changes: 1 addition & 1 deletion ...uffle/core/ArrayForeignAccessFactory.java → ...core/array/ArrayForeignAccessFactory.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.core;
package org.jruby.truffle.core.array;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
3 changes: 2 additions & 1 deletion ...a/org/jruby/truffle/core/ArrayLayout.java → ...jruby/truffle/core/array/ArrayLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.array;

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.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;

7 changes: 2 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
import org.jruby.truffle.core.format.parser.PackCompiler;
import org.jruby.truffle.core.format.runtime.PackResult;
import org.jruby.truffle.core.format.runtime.exceptions.*;
import org.jruby.truffle.core.rope.*;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
@@ -54,16 +55,12 @@
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ArrayOperations;
import org.jruby.truffle.core.CoreSourceSection;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.methods.Arity;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.methods.SharedMethodInfo;
import org.jruby.truffle.core.rope.CodeRange;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.rope.ValidLeafRope;
import org.jruby.util.Memo;

import java.util.Arrays;
3 changes: 2 additions & 1 deletion ...g/jruby/truffle/core/ArrayOperations.java → ...y/truffle/core/array/ArrayOperations.java
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,12 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.array;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.array.ArrayReflector;
import org.jruby.truffle.core.array.ArrayUtils;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.ArrayOperations;
import org.jruby.truffle.core.Layouts;

@NodeChildren({
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.ArrayOperations;
import org.jruby.truffle.core.Layouts;

@NodeChildren({
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/conversion/ToSymbolNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;

@NodeChild(value="child", type=RubyNode.class)
public abstract class ToSymbolNode extends RubyNode {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/format/FormatFloatNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.parser.PrintfTreeBuilder;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.util.ByteList;

import java.nio.charset.StandardCharsets;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadBase64StringNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.core.format.runtime.exceptions.FormatException;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.Pack;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadBinaryStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadBitStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadHexStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.Pack;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadMIMEStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.Pack;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadUUStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.nodes.SourceNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/type/ToStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
import org.jruby.truffle.language.objects.IsTaintedNode;
import org.jruby.truffle.language.objects.IsTaintedNodeGen;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.util.ByteList;

import java.nio.charset.StandardCharsets;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/write/WriteUTF8CharacterNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
import org.jruby.truffle.core.format.nodes.PackNode;
import org.jruby.truffle.core.format.runtime.exceptions.RangeException;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.StringOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.rope.CodeRange;

/**
2 changes: 1 addition & 1 deletion ...ruffle/core/HashForeignAccessFactory.java → ...e/core/hash/HashForeignAccessFactory.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.core;
package org.jruby.truffle.core.hash;

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
Loading

0 comments on commit 71bf571

Please sign in to comment.