Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de692448fd34
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8dd533354f4b
Choose a head ref
  • 10 commits
  • 78 files changed
  • 1 contributor

Commits on Feb 6, 2016

  1. [Truffle] Create an extra package for non-standard library.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    221dc82 View commit details

  2. [Truffle] Move fiber to a package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    407c876 View commit details

  3. [Truffle] Move encoding into a package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    f547a3a View commit details

  4. [Truffle] Range package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    78b6d7c View commit details

  5. [Truffle] Thread package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    df84646 View commit details

  6. [Truffle] Symbol package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    28a97d9 View commit details

  7. [Truffle] Move interpolated nodes into packages.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    0190b54 View commit details

  8. [Truffle] Module package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    b3cbab2 View commit details

  9. [Truffle] Methods package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    7c9511b View commit details

  10. [Truffle] Numeric package.

    @chrisseaton
    chrisseaton committed Feb 6, 2016
    Copy the full SHA
    8dd5333 View commit details
Showing with 203 additions and 106 deletions.
  1. +3 −0 truffle/src/main/java/org/jruby/truffle/RubyContext.java
  2. +2 −0 truffle/src/main/java/org/jruby/truffle/core/ClassLayout.java
  3. +3 −0 truffle/src/main/java/org/jruby/truffle/core/ClassNodes.java
  4. +18 −1 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
  5. +1 −1 truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
  6. +5 −1 truffle/src/main/java/org/jruby/truffle/core/KernelNodes.java
  7. +19 −0 truffle/src/main/java/org/jruby/truffle/core/Layouts.java
  8. +2 −0 truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/core/MutexNodes.java
  10. +2 −0 truffle/src/main/java/org/jruby/truffle/core/ObjectSpaceManager.java
  11. +1 −0 truffle/src/main/java/org/jruby/truffle/core/PrependMarker.java
  12. +1 −1 truffle/src/main/java/org/jruby/truffle/core/QueueNodes.java
  13. +1 −1 truffle/src/main/java/org/jruby/truffle/core/SizedQueueNodes.java
  14. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
  15. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/PrimitiveArrayNodeFactory.java
  16. +2 −4 truffle/src/main/java/org/jruby/truffle/core/coerce/ToIntNode.java
  17. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → encoding}/EncodingConverterLayout.java
  18. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → encoding}/EncodingConverterNodes.java
  19. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → encoding}/EncodingLayout.java
  20. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → encoding}/EncodingNodes.java
  21. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → encoding}/EncodingOperations.java
  22. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → fiber}/FiberLayout.java
  23. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → fiber}/FiberManager.java
  24. +6 −6 truffle/src/main/java/org/jruby/truffle/core/{ → fiber}/FiberNodes.java
  25. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/nodes/read/ReadBERNode.java
  26. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/nodes/type/AsUnsignedNode.java
  27. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → method}/MethodFilter.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → method}/MethodLayout.java
  29. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → method}/MethodNodes.java
  30. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → method}/UnboundMethodLayout.java
  31. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → method}/UnboundMethodNodes.java
  32. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → module}/AncestorIterator.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → module}/IncludedModule.java
  34. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → module}/IncludedModulesIterator.java
  35. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → module}/ModuleFields.java
  36. +1 −2 truffle/src/main/java/org/jruby/truffle/core/{ → module}/ModuleLayout.java
  37. +16 −18 truffle/src/main/java/org/jruby/truffle/core/{ → module}/ModuleNodes.java
  38. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/BignumLayout.java
  39. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/BignumNodes.java
  40. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{fixnum → numeric}/FixnumLiteralNode.java
  41. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{fixnum → numeric}/FixnumLowerNode.java
  42. +2 −3 truffle/src/main/java/org/jruby/truffle/core/{fixnum → numeric}/FixnumNodes.java
  43. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/FixnumOrBignumNode.java
  44. +5 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/FloatNodes.java
  45. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/GeneralDivModNode.java
  46. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → numeric}/IntegerNodes.java
  47. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → range}/IntegerFixnumRangeLayout.java
  48. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → range}/LongFixnumRangeLayout.java
  49. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → range}/ObjectRangeLayout.java
  50. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → range}/RangeNodes.java
  51. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → regexp}/InterpolatedRegexpNode.java
  52. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/EncodingConverterPrimitiveNodes.java
  53. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/EncodingPrimitiveNodes.java
  54. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/FixnumPrimitiveNodes.java
  55. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/FloatPrimitiveNodes.java
  56. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
  57. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusPrimitiveCallConstructor.java
  58. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusPrimitiveNodeConstructor.java
  59. +2 −2 truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java
  60. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java
  61. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → string}/InterpolatedStringNode.java
  62. +3 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  63. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java
  64. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → symbol}/SymbolCodeRangeableWrapper.java
  65. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → symbol}/SymbolLayout.java
  66. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → symbol}/SymbolNodes.java
  67. +2 −1 truffle/src/main/java/org/jruby/truffle/core/{ → symbol}/SymbolTable.java
  68. +1 −1 truffle/src/main/java/org/jruby/truffle/core/{ → thread}/ThreadBacktraceLocationLayout.java
  69. +4 −1 truffle/src/main/java/org/jruby/truffle/core/{ → thread}/ThreadBacktraceLocationNodes.java
  70. +2 −2 truffle/src/main/java/org/jruby/truffle/core/{ → thread}/ThreadLayout.java
  71. +3 −1 truffle/src/main/java/org/jruby/truffle/core/{ → thread}/ThreadManager.java
  72. +4 −1 truffle/src/main/java/org/jruby/truffle/core/{ → thread}/ThreadNodes.java
  73. +4 −1 truffle/src/main/java/org/jruby/truffle/{core → extra}/AttachmentsManager.java
  74. +1 −1 truffle/src/main/java/org/jruby/truffle/language/LazyRubyRootNode.java
  75. +1 −1 truffle/src/main/java/org/jruby/truffle/language/objects/DefineOrGetModuleNode.java
  76. +8 −5 truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
  77. +1 −0 truffle/src/main/java/org/jruby/truffle/stdlib/BigDecimalNodes.java
  78. +1 −1 truffle/src/main/java/org/jruby/truffle/util/FileUtils.java
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
@@ -33,6 +33,9 @@
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.core.symbol.SymbolTable;
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.extra.AttachmentsManager;
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/ClassLayout.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@

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

3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ClassNodes.java
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@
import com.oracle.truffle.api.object.ObjectType;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.module.ModuleFields;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
19 changes: 18 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -30,15 +30,32 @@
import org.jruby.ext.ffi.Platform.OS_TYPE;
import org.jruby.runtime.Constants;
import org.jruby.runtime.encoding.EncodingService;
import org.jruby.truffle.core.encoding.EncodingConverterNodesFactory;
import org.jruby.truffle.core.encoding.EncodingNodes;
import org.jruby.truffle.core.encoding.EncodingNodesFactory;
import org.jruby.truffle.core.encoding.EncodingOperations;
import org.jruby.truffle.core.fiber.FiberNodesFactory;
import org.jruby.truffle.core.method.MethodNodesFactory;
import org.jruby.truffle.core.method.UnboundMethodNodesFactory;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.core.numeric.BignumNodesFactory;
import org.jruby.truffle.core.numeric.FixnumNodesFactory;
import org.jruby.truffle.core.numeric.FloatNodesFactory;
import org.jruby.truffle.core.numeric.IntegerNodesFactory;
import org.jruby.truffle.core.range.RangeNodesFactory;
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.core.symbol.SymbolNodesFactory;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationNodesFactory;
import org.jruby.truffle.core.thread.ThreadNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.array.ArrayNodes;
import org.jruby.truffle.core.array.ArrayNodesFactory;
import org.jruby.truffle.core.fixnum.FixnumNodesFactory;
import org.jruby.truffle.core.hash.HashNodesFactory;
import org.jruby.truffle.stdlib.BigDecimalNodesFactory;
import org.jruby.truffle.stdlib.DigestNodesFactory;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/CoreMethodNodeManager.java
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
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;
6 changes: 5 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -30,10 +30,14 @@
import org.jcodings.specific.UTF8Encoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.encoding.EncodingNodes;
import org.jruby.truffle.core.encoding.EncodingOperations;
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.method.MethodFilter;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.thread.ThreadBacktraceLocationLayoutImpl;
import org.jruby.truffle.language.*;
import org.jruby.truffle.language.arguments.RubyArguments;
import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen;
@@ -67,7 +71,7 @@
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.methods.SharedMethodInfo;
import org.jruby.truffle.core.rope.Rope;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.language.translator.TranslatorDriver;
import org.jruby.truffle.language.translator.TranslatorDriver.ParserContext;
import org.jruby.util.ByteList;
19 changes: 19 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/Layouts.java
View file
Original file line number Diff line number Diff line change
@@ -12,14 +12,33 @@
import com.oracle.truffle.api.object.HiddenKey;
import org.jruby.truffle.core.array.ArrayLayout;
import org.jruby.truffle.core.array.ArrayLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingConverterLayout;
import org.jruby.truffle.core.encoding.EncodingConverterLayoutImpl;
import org.jruby.truffle.core.encoding.EncodingLayout;
import org.jruby.truffle.core.encoding.EncodingLayoutImpl;
import org.jruby.truffle.core.fiber.FiberLayout;
import org.jruby.truffle.core.fiber.FiberLayoutImpl;
import org.jruby.truffle.core.hash.HashLayout;
import org.jruby.truffle.core.hash.HashLayoutImpl;
import org.jruby.truffle.core.method.MethodLayout;
import org.jruby.truffle.core.method.MethodLayoutImpl;
import org.jruby.truffle.core.method.UnboundMethodLayout;
import org.jruby.truffle.core.method.UnboundMethodLayoutImpl;
import org.jruby.truffle.core.module.ModuleLayout;
import org.jruby.truffle.core.module.ModuleLayoutImpl;
import org.jruby.truffle.core.numeric.BignumLayout;
import org.jruby.truffle.core.numeric.BignumLayoutImpl;
import org.jruby.truffle.core.range.*;
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.core.symbol.SymbolLayout;
import org.jruby.truffle.core.symbol.SymbolLayoutImpl;
import org.jruby.truffle.core.thread.ThreadLayout;
import org.jruby.truffle.core.thread.ThreadLayoutImpl;
import org.jruby.truffle.stdlib.BigDecimalLayout;
import org.jruby.truffle.stdlib.BigDecimalLayoutImpl;
import org.jruby.truffle.stdlib.psych.EmitterLayout;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.RubyContext;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/MutexNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;

import java.util.concurrent.locks.ReentrantLock;

2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/ObjectSpaceManager.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
import com.oracle.truffle.api.utilities.CyclicAssumption;
import org.jruby.RubyGC;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.core.thread.ThreadNodes;
import org.jruby.truffle.language.control.RaiseException;

import java.lang.ref.ReferenceQueue;
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/core/PrependMarker.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.module.IncludedModule;
import org.jruby.truffle.language.ModuleChain;

public class PrependMarker implements ModuleChain {
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/QueueNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.util.MethodHandleUtils;

import java.lang.invoke.MethodHandle;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/SizedQueueNodes.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.util.MethodHandleUtils;

import java.lang.invoke.MethodHandle;
2 changes: 1 addition & 1 deletion 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.numeric.FixnumLowerNodeGen;
import org.jruby.truffle.core.rope.*;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
@@ -43,7 +44,6 @@
import org.jruby.truffle.core.coerce.ToIntNode;
import org.jruby.truffle.core.coerce.ToIntNodeGen;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.fixnum.FixnumLowerNodeGen;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.language.dispatch.MissingBehavior;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/PrimitiveArrayNodeFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.fixnum.FixnumLiteralNode;
import org.jruby.truffle.core.numeric.FixnumLiteralNode;
import org.jruby.truffle.RubyContext;

public abstract class PrimitiveArrayNodeFactory {
6 changes: 2 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/coerce/ToIntNode.java
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,6 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/


package org.jruby.truffle.core.coerce;

import com.oracle.truffle.api.CompilerDirectives;
@@ -18,10 +16,10 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.numeric.FloatNodesFactory;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.FloatNodes;
import org.jruby.truffle.core.FloatNodesFactory;
import org.jruby.truffle.core.numeric.FloatNodes;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.RubyContext;
3 changes: 2 additions & 1 deletion ...truffle/core/EncodingConverterLayout.java → ...ore/encoding/EncodingConverterLayout.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.encoding;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.transcode.EConv;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;

3 changes: 2 additions & 1 deletion .../truffle/core/EncodingConverterNodes.java → ...core/encoding/EncodingConverterNodes.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.encoding;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
@@ -24,6 +24,7 @@
import org.jruby.Ruby;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.core.*;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.RubyContext;
3 changes: 2 additions & 1 deletion ...rg/jruby/truffle/core/EncodingLayout.java → ...truffle/core/encoding/EncodingLayout.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.encoding;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jcodings.Encoding;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.util.ByteList;
4 changes: 3 additions & 1 deletion ...org/jruby/truffle/core/EncodingNodes.java → .../truffle/core/encoding/EncodingNodes.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.encoding;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -22,7 +22,9 @@
import org.jcodings.specific.UTF8Encoding;
import org.jcodings.util.CaseInsensitiveBytesHash;
import org.jcodings.util.Hash;
import org.jruby.truffle.core.*;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.core.symbol.SymbolNodes;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.core.coerce.ToStrNode;
import org.jruby.truffle.core.coerce.ToStrNodeGen;
3 changes: 2 additions & 1 deletion ...ruby/truffle/core/EncodingOperations.java → ...fle/core/encoding/EncodingOperations.java
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,14 @@
* Some of the code in this class is transposed from org.jruby.runtime.encoding.EncodingService,
* licensed under the same EPL1.0/GPL 2.0/LGPL 2.1 used throughout.
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.encoding;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.Encoding;
import org.jcodings.EncodingDB;
import org.jruby.truffle.core.Layouts;
import org.jruby.util.ByteList;

public abstract class EncodingOperations {
3 changes: 2 additions & 1 deletion ...a/org/jruby/truffle/core/FiberLayout.java → ...jruby/truffle/core/fiber/FiberLayout.java
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.fiber;

import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.object.DynamicObjectFactory;
import org.jruby.truffle.core.BasicObjectLayout;
import org.jruby.truffle.om.dsl.api.Layout;
import org.jruby.truffle.om.dsl.api.Nullable;
import org.jruby.truffle.om.dsl.api.Volatile;
3 changes: 2 additions & 1 deletion .../org/jruby/truffle/core/FiberManager.java → ...ruby/truffle/core/fiber/FiberManager.java
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*/
package org.jruby.truffle.core;
package org.jruby.truffle.core.fiber;

import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.RubyContext;

12 changes: 6 additions & 6 deletions ...va/org/jruby/truffle/core/FiberNodes.java → .../jruby/truffle/core/fiber/FiberNodes.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.fiber;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -17,18 +17,18 @@
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.core.*;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.core.cast.SingleValueCastNode;
import org.jruby.truffle.core.cast.SingleValueCastNodeGen;
import org.jruby.truffle.core.FiberNodesFactory.FiberTransferNodeFactory;
import org.jruby.truffle.language.methods.UnsupportedOperationBehavior;
import org.jruby.truffle.core.rubinius.ThreadPrimitiveNodes.ThreadRaisePrimitiveNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.control.BreakException;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.control.ReturnException;
import org.jruby.truffle.core.ThreadManager.BlockingAction;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;

import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
@@ -155,7 +155,7 @@ public static void cleanup(RubyContext context, DynamicObject fiber) {
private static Object[] waitForResume(RubyContext context, final DynamicObject fiber) {
assert RubyGuards.isRubyFiber(fiber);

final FiberMessage message = context.getThreadManager().runUntilResult(null, new ThreadManager.BlockingAction<FiberMessage>() {
final FiberMessage message = context.getThreadManager().runUntilResult(null, new BlockingAction<FiberMessage>() {
@Override
public FiberMessage block() throws InterruptedException {
return Layouts.FIBER.getMessageQueue(fiber).take();
@@ -271,7 +271,7 @@ public abstract static class ResumeNode extends CoreMethodArrayArgumentsNode {

public ResumeNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
fiberTransferNode = FiberTransferNodeFactory.create(context, sourceSection, new RubyNode[] { null, null, null });
fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(context, sourceSection, new RubyNode[] { null, null, null });
}

@Specialization
@@ -288,7 +288,7 @@ public abstract static class YieldNode extends CoreMethodArrayArgumentsNode {

public YieldNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
fiberTransferNode = FiberTransferNodeFactory.create(context, sourceSection, new RubyNode[] { null, null, null });
fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(context, sourceSection, new RubyNode[] { null, null, null });
}

@Specialization
Loading