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: ca9fde263302
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c902fd61506
Choose a head ref
  • 10 commits
  • 70 files changed
  • 1 contributor

Commits on Apr 3, 2016

  1. [Truffle] Organise imports.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    0fe89aa View commit details

  2. [Truffle] Refactor out InteropExecute.

    @chrisseaton
    chrisseaton committed Apr 3, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6245ab1 View commit details

  3. [Truflfe] Move ExecuteMethodNode into ForeignExecuteNode, as that's t… 

    …he only user.
    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    11a8604 View commit details

  4. [Truffle] Consolidate the invoke nodes.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    dc15681 View commit details

  5. [Truffle] Consolidate the foreign read nodes.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    8002424 View commit details

  6. [Truffle] Consolidate interop write nodes.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    815dfe0 View commit details

  7. [Truffle] Remove the TargetableRubyNode abstraction.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    3b93ef9 View commit details

  8. [Truffle] Factor out RubyInteropArgumentNode and RubyInteropReceiverN… 

    …ode.
    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    a79177c View commit details

  9. [Truffle] Tidy up IndexLabelToRubyNode into a general ForeignToRubyNode.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    48124d9 View commit details

  10. [Truffle] Tidy up RubyToIndexLabelNode into a general RubyToForeignNode.

    @chrisseaton
    chrisseaton committed Apr 3, 2016
    Copy the full SHA
    4c902fd View commit details
Showing with 593 additions and 1,017 deletions.
  1. +4 −2 truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
  3. +8 −1 truffle/src/main/java/org/jruby/truffle/core/format/FormatExceptionTranslator.java
  4. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/LiteralFormatNode.java
  5. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/control/ReverseOutputPositionNode.java
  6. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/control/ReverseSourcePositionNode.java
  7. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger16BigNode.java
  8. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger16LittleNode.java
  9. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger32BigNode.java
  10. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger32LittleNode.java
  11. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger64BigNode.java
  12. +0 −4 truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger64LittleNode.java
  13. +0 −2 truffle/src/main/java/org/jruby/truffle/core/format/convert/Integer64BigToBytesNode.java
  14. +0 −2 truffle/src/main/java/org/jruby/truffle/core/format/convert/Integer64LittleToBytesNode.java
  15. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretByteAsIntegerNode.java
  16. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretIntegerAsFloatNode.java
  17. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretLongAsDoubleNode.java
  18. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java
  19. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/pack/PackCompiler.java
  20. +6 −6 truffle/src/main/java/org/jruby/truffle/core/format/pack/PackTreeBuilder.java
  21. +2 −2 truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfCompiler.java
  22. +6 −6 truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java
  23. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadDoubleNode.java
  24. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadIntegerNode.java
  25. +1 −3 truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadLongOrBigIntegerNode.java
  26. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadStringNode.java
  27. +0 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadValueNode.java
  28. +1 −2 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java
  29. +0 −2 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java
  30. +1 −2 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBytesNode.java
  31. +0 −2 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java
  32. +0 −2 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java
  33. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUTF8CharacterNode.java
  34. +0 −3 truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java
  35. +1 −1 truffle/src/main/java/org/jruby/truffle/core/format/unpack/UnpackCompiler.java
  36. +9 −9 truffle/src/main/java/org/jruby/truffle/core/format/unpack/UnpackTreeBuilder.java
  37. +3 −4 truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
  38. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  39. +1 −0 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
  40. +0 −86 truffle/src/main/java/org/jruby/truffle/interop/ExecuteMethodNode.java
  41. +80 −7 truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteNode.java
  42. +0 −3 truffle/src/main/java/org/jruby/truffle/interop/ForeignGetSizeNode.java
  43. +0 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignHasSizeNode.java
  44. +56 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignInvokeNode.java
  45. +0 −4 truffle/src/main/java/org/jruby/truffle/interop/ForeignIsBoxedNode.java
  46. +0 −5 truffle/src/main/java/org/jruby/truffle/interop/ForeignIsExecutableNode.java
  47. +0 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignIsNullNode.java
  48. +210 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignReadNode.java
  49. +13 −11 truffle/src/main/java/org/jruby/truffle/interop/{IndexLabelToRubyNode.java → ForeignToRubyNode.java}
  50. +163 −1 truffle/src/main/java/org/jruby/truffle/interop/ForeignWriteNode.java
  51. +0 −31 truffle/src/main/java/org/jruby/truffle/interop/InteropExecute.java
  52. +0 −42 truffle/src/main/java/org/jruby/truffle/interop/InteropInstanceVariableReadNode.java
  53. +0 −42 truffle/src/main/java/org/jruby/truffle/interop/InteropInstanceVariableWriteNode.java
  54. +0 −47 truffle/src/main/java/org/jruby/truffle/interop/InteropReadStringByteNode.java
  55. +0 −49 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropExecuteAfterReadNode.java
  56. +0 −41 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropIndexedReadNode.java
  57. +0 −44 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropIndexedWriteNode.java
  58. +0 −45 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropReadFromSymbolNode.java
  59. +0 −44 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropReadNode.java
  60. +0 −49 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropWriteNode.java
  61. +0 −51 truffle/src/main/java/org/jruby/truffle/interop/ResolvedInteropWriteToSymbolNode.java
  62. +0 −31 truffle/src/main/java/org/jruby/truffle/interop/RubyInteropArgumentNode.java
  63. +0 −27 truffle/src/main/java/org/jruby/truffle/interop/RubyInteropReceiverNode.java
  64. +15 −8 truffle/src/main/java/org/jruby/truffle/interop/{RubyToIndexLabelNode.java → RubyToForeignNode.java}
  65. +0 −27 truffle/src/main/java/org/jruby/truffle/interop/TargetableRubyNode.java
  66. +0 −39 truffle/src/main/java/org/jruby/truffle/interop/UnresolvedInteropExecuteAfterReadNode.java
  67. +0 −66 truffle/src/main/java/org/jruby/truffle/interop/UnresolvedInteropReadNode.java
  68. +0 −55 truffle/src/main/java/org/jruby/truffle/interop/UnresolvedInteropStringReadNode.java
  69. +0 −62 truffle/src/main/java/org/jruby/truffle/interop/UnresolvedInteropWriteNode.java
  70. +6 −6 truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedForeignDispatchNode.java
6 changes: 4 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -43,10 +43,10 @@
import org.jruby.truffle.core.coerce.ToAryNodeGen;
import org.jruby.truffle.core.coerce.ToIntNode;
import org.jruby.truffle.core.coerce.ToIntNodeGen;
import org.jruby.truffle.core.format.FormatExceptionTranslator;
import org.jruby.truffle.core.format.pack.PackCompiler;
import org.jruby.truffle.core.format.BytesResult;
import org.jruby.truffle.core.format.FormatExceptionTranslator;
import org.jruby.truffle.core.format.exceptions.FormatException;
import org.jruby.truffle.core.format.pack.PackCompiler;
import org.jruby.truffle.core.kernel.KernelNodes;
import org.jruby.truffle.core.kernel.KernelNodesFactory;
import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
@@ -81,7 +81,9 @@
import org.jruby.truffle.language.objects.TaintNodeGen;
import org.jruby.truffle.language.yield.YieldNode;
import org.jruby.util.Memo;

import java.util.Arrays;

import static org.jruby.truffle.core.array.ArrayHelpers.createArray;
import static org.jruby.truffle.core.array.ArrayHelpers.getSize;
import static org.jruby.truffle.core.array.ArrayHelpers.getStore;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
View file
Original file line number Diff line number Diff line change
@@ -28,14 +28,14 @@
import org.jruby.truffle.core.cast.SingleValueCastNode;
import org.jruby.truffle.core.cast.SingleValueCastNodeGen;
import org.jruby.truffle.core.proc.ProcNodes;
import org.jruby.truffle.core.rubinius.ThreadPrimitiveNodes.ThreadRaisePrimitiveNode;
import org.jruby.truffle.core.thread.ThreadManager.BlockingAction;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
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.language.methods.UnsupportedOperationBehavior;

import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;

9 changes: 8 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/FormatExceptionTranslator.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,14 @@

import com.oracle.truffle.api.CompilerDirectives;
import org.jruby.truffle.core.CoreLibrary;
import org.jruby.truffle.core.format.exceptions.*;
import org.jruby.truffle.core.format.exceptions.CantCompressNegativeException;
import org.jruby.truffle.core.format.exceptions.CantConvertException;
import org.jruby.truffle.core.format.exceptions.FormatException;
import org.jruby.truffle.core.format.exceptions.InvalidFormatException;
import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException;
import org.jruby.truffle.core.format.exceptions.OutsideOfStringException;
import org.jruby.truffle.core.format.exceptions.RangeException;
import org.jruby.truffle.core.format.exceptions.TooFewArgumentsException;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.control.RaiseException;

1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/LiteralFormatNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;

public class LiteralFormatNode extends FormatNode {

1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/control/ReverseOutputPositionNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
*/
package org.jruby.truffle.core.format.control;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.RubyContext;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/control/ReverseSourcePositionNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
*/
package org.jruby.truffle.core.format.control;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.RubyContext;
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger16BigNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger16LittleNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger32BigNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger32LittleNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger64BigNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/BytesToInteger64LittleNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,11 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;

@NodeChildren({
@NodeChild(value = "bytes", type = FormatNode.class),
})
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/Integer64BigToBytesNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,8 @@
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.object.DynamicObject;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

@NodeChildren({
@NodeChild(value = "value", type = FormatNode.class),
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/format/convert/Integer64LittleToBytesNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,8 @@
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.object.DynamicObject;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.MissingValue;

@NodeChildren({
@NodeChild(value = "value", type = FormatNode.class),
1 change: 0 additions & 1 deletion ...fle/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretByteAsIntegerNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
1 change: 0 additions & 1 deletion ...le/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretIntegerAsFloatNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/convert/ReinterpretLongAsDoubleNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
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.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@
import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException;
import org.jruby.truffle.core.kernel.KernelNodes;
import org.jruby.truffle.core.kernel.KernelNodesFactory;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/pack/PackCompiler.java
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
import org.antlr.v4.runtime.CommonTokenStream;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.DescriptionTruncater;
import org.jruby.truffle.core.format.FormatRootNode;
import org.jruby.truffle.core.format.FormatErrorListener;
import org.jruby.truffle.core.format.FormatRootNode;
import org.jruby.truffle.core.format.LoopRecovery;
import org.jruby.truffle.language.RubyNode;

12 changes: 6 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/format/pack/PackTreeBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -11,10 +11,14 @@

import com.oracle.truffle.api.nodes.Node;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatEncoding;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.LiteralFormatNode;
import org.jruby.truffle.core.format.SharedTreeBuilder;
import org.jruby.truffle.core.format.control.AdvanceSourcePositionNode;
import org.jruby.truffle.core.format.control.ReverseOutputPositionNode;
import org.jruby.truffle.core.format.control.SequenceNode;
import org.jruby.truffle.core.format.control.SetOutputPositionNode;
import org.jruby.truffle.core.format.convert.Integer16BigToBytesNodeGen;
import org.jruby.truffle.core.format.convert.Integer16LittleToBytesNodeGen;
import org.jruby.truffle.core.format.convert.Integer32BigToBytesNodeGen;
@@ -23,26 +27,22 @@
import org.jruby.truffle.core.format.convert.Integer64LittleToBytesNodeGen;
import org.jruby.truffle.core.format.convert.ReinterpretAsLongNodeGen;
import org.jruby.truffle.core.format.convert.ToFloatNodeGen;
import org.jruby.truffle.core.format.convert.ToLongNodeGen;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.control.SetOutputPositionNode;
import org.jruby.truffle.core.format.control.ReverseOutputPositionNode;
import org.jruby.truffle.core.format.control.SequenceNode;
import org.jruby.truffle.core.format.read.array.ReadDoubleNodeGen;
import org.jruby.truffle.core.format.read.array.ReadLongOrBigIntegerNodeGen;
import org.jruby.truffle.core.format.read.array.ReadStringNodeGen;
import org.jruby.truffle.core.format.read.array.ReadValueNodeGen;
import org.jruby.truffle.core.format.convert.ToLongNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteByteNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBERNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBase64StringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBinaryStringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBitStringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteByteNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBytesNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteHexStringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteMIMEStringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteUTF8CharacterNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteUUStringNodeGen;
import org.jruby.truffle.core.format.FormatEncoding;
import org.jruby.truffle.language.control.RaiseException;

import java.nio.ByteOrder;
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfCompiler.java
View file
Original file line number Diff line number Diff line change
@@ -15,9 +15,9 @@
import org.antlr.v4.runtime.CommonTokenStream;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.DescriptionTruncater;
import org.jruby.truffle.core.format.FormatRootNode;
import org.jruby.truffle.core.format.FormatErrorListener;
import org.jruby.truffle.core.format.FormatEncoding;
import org.jruby.truffle.core.format.FormatErrorListener;
import org.jruby.truffle.core.format.FormatRootNode;
import org.jruby.truffle.language.RubyNode;

import org.jruby.truffle.core.format.printf.PrintfLexer;
12 changes: 6 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -13,19 +13,19 @@
import org.antlr.v4.runtime.Token;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.format.FormatFloatHumanReadableNodeGen;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.LiteralFormatNode;
import org.jruby.truffle.core.format.control.SequenceNode;
import org.jruby.truffle.core.format.convert.ToDoubleWithCoercionNodeGen;
import org.jruby.truffle.core.format.convert.ToIntegerNodeGen;
import org.jruby.truffle.core.format.convert.ToStringNodeGen;
import org.jruby.truffle.core.format.format.FormatFloatHumanReadableNodeGen;
import org.jruby.truffle.core.format.format.FormatFloatNodeGen;
import org.jruby.truffle.core.format.format.FormatIntegerNodeGen;
import org.jruby.truffle.core.format.LiteralFormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.read.array.ReadHashValueNodeGen;
import org.jruby.truffle.core.format.read.array.ReadIntegerNodeGen;
import org.jruby.truffle.core.format.read.array.ReadStringNodeGen;
import org.jruby.truffle.core.format.read.array.ReadValueNodeGen;
import org.jruby.truffle.core.format.convert.ToDoubleWithCoercionNodeGen;
import org.jruby.truffle.core.format.convert.ToIntegerNodeGen;
import org.jruby.truffle.core.format.convert.ToStringNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteByteNodeGen;
import org.jruby.truffle.core.format.write.bytes.WriteBytesNodeGen;
import org.jruby.truffle.core.format.write.bytes.WritePaddedBytesNodeGen;
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadDoubleNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@
import com.oracle.truffle.api.frame.VirtualFrame;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.convert.ToDoubleNode;
import org.jruby.truffle.core.format.convert.ToDoubleNodeGen;
import org.jruby.truffle.core.format.read.SourceNode;

@NodeChildren({
@NodeChild(value = "source", type = SourceNode.class),
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadIntegerNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@
import com.oracle.truffle.api.profiles.ConditionProfile;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.convert.ToIntegerNode;
import org.jruby.truffle.core.format.convert.ToIntegerNodeGen;
import org.jruby.truffle.core.format.read.SourceNode;

@NodeChildren({
@NodeChild(value = "source", type = SourceNode.class),
4 changes: 1 addition & 3 deletions truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadLongOrBigIntegerNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,9 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatGuards;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.convert.ToLongNode;
import org.jruby.truffle.core.format.convert.ToLongNodeGen;

import java.math.BigInteger;
import org.jruby.truffle.core.format.read.SourceNode;

@NodeChildren({
@NodeChild(value = "source", type = SourceNode.class),
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadStringNode.java
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.LiteralFormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.convert.ToStringNode;
import org.jruby.truffle.core.format.convert.ToStringNodeGen;
import org.jruby.truffle.core.format.read.SourceNode;
import org.jruby.truffle.core.format.write.bytes.WriteByteNodeGen;

@NodeChildren({
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadValueNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
*/
package org.jruby.truffle.core.format.read.array;

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;
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java
View file
Original file line number Diff line number Diff line change
@@ -51,12 +51,11 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import org.jcodings.specific.ASCIIEncoding;
import org.jcodings.specific.USASCIIEncoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.format.FormatNode;
import org.jruby.truffle.core.format.read.SourceNode;
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;

Loading