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

Commits on May 5, 2016

  1. Copy the full SHA
    762ad7a View commit details
  2. Copy the full SHA
    7beb1f1 View commit details
Showing with 282 additions and 261 deletions.
  1. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/BinaryCoreMethodNode.java
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreClass.java
  3. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreMethod.java
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreMethodArrayArgumentsNode.java
  5. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreMethodNode.java
  6. +5 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreMethodNodeManager.java
  7. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/CoreSourceSection.java
  8. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/RubiniusOnly.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/UnaryCoreMethodNode.java
  10. +1 −1 truffle/src/main/java/org/jruby/truffle/{core → builtins}/YieldingCoreMethodNode.java
  11. +2 −0 truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
  12. +3 −0 truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
  13. +3 −0 truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
  14. +4 −0 truffle/src/main/java/org/jruby/truffle/core/ProcessNodes.java
  15. +3 −0 truffle/src/main/java/org/jruby/truffle/core/TruffleGCNodes.java
  16. +3 −0 truffle/src/main/java/org/jruby/truffle/core/TruffleProcessNodes.java
  17. +4 −0 truffle/src/main/java/org/jruby/truffle/core/TruffleSystemNodes.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayCoreMethodNode.java
  19. +6 −6 truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
  20. +6 −6 truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java
  21. +4 −4 truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java
  22. +3 −3 truffle/src/main/java/org/jruby/truffle/core/binding/TruffleBindingNodes.java
  23. +3 −3 truffle/src/main/java/org/jruby/truffle/core/bool/FalseClassNodes.java
  24. +4 −4 truffle/src/main/java/org/jruby/truffle/core/bool/TrueClassNodes.java
  25. +4 −4 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java
  26. +5 −5 truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java
  27. +5 −0 truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java
  28. +4 −4 truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java
  29. +5 −5 truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
  30. +6 −6 truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
  31. +5 −5 truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
  32. +3 −3 truffle/src/main/java/org/jruby/truffle/core/kernel/TruffleKernelNodes.java
  33. +3 −3 truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java
  34. +4 −4 truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java
  35. +4 −4 truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java
  36. +1 −1 truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java
  37. +4 −4 truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
  38. +4 −4 truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java
  39. +4 −4 truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java
  40. +3 −3 truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java
  41. +3 −3 truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java
  42. +4 −4 truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java
  43. +3 −3 truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java
  44. +4 −4 truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java
  45. +5 −5 truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java
  46. +5 −5 truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java
  47. +4 −4 truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java
  48. +7 −7 truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java
  49. +5 −5 truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java
  50. +4 −4 truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java
  51. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rope/TruffleRopesNodes.java
  52. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java
  53. +4 −4 truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java
  54. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java
  55. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusPrimitiveNodeConstructor.java
  56. +3 −3 truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java
  57. +6 −6 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  58. +5 −5 truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java
  59. +3 −3 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadBacktraceLocationNodes.java
  60. +5 −5 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
  61. +4 −4 truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java
  62. +5 −5 truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java
  63. +4 −4 truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java
  64. +3 −3 truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java
  65. +3 −3 truffle/src/main/java/org/jruby/truffle/extra/TruffleGraalNodes.java
  66. +3 −3 truffle/src/main/java/org/jruby/truffle/interop/CExtNodes.java
  67. +3 −3 truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java
  68. +1 −1 truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java
  69. +4 −4 truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java
  70. +4 −4 truffle/src/main/java/org/jruby/truffle/language/TruffleSafeNodes.java
  71. +15 −25 truffle/src/main/java/org/jruby/truffle/language/constants/WriteConstantNode.java
  72. +3 −1 truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java
  73. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java
  74. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/EtcNodes.java
  75. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java
  76. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java
  77. +4 −6 truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java
  78. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java
  79. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java
  80. +3 −3 truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java
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.builtins;

import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.NodeChildren;
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.builtins;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
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.builtins;

import org.jruby.runtime.Visibility;
import org.jruby.truffle.language.methods.UnsupportedOperationBehavior;
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.builtins;

import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.source.SourceSection;
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.builtins;

import com.oracle.truffle.api.dsl.GenerateNodeFactory;
import com.oracle.truffle.api.source.SourceSection;
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.builtins;

import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.dsl.GeneratedBy;
@@ -18,6 +18,10 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.RaiseIfFrozenNode;
import org.jruby.truffle.core.ReturnEnumeratorIfNoBlockNode;
import org.jruby.truffle.core.UnsafeNode;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.cast.TaintResultNode;
import org.jruby.truffle.core.module.ModuleOperations;
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.builtins;

import com.oracle.truffle.api.source.SourceSection;

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.builtins;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
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.builtins;

import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.source.SourceSection;
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.builtins;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@
import org.jruby.runtime.Constants;
import org.jruby.runtime.encoding.EncodingService;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.builtins.CoreMethodNodeManager;
import org.jruby.truffle.builtins.CoreSourceSection;
import org.jruby.truffle.core.array.ArrayNodes;
import org.jruby.truffle.core.array.ArrayNodesFactory;
import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory;
3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
Original file line number Diff line number Diff line change
@@ -15,6 +15,9 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.module.ModuleNodes;
import org.jruby.truffle.core.module.ModuleNodesFactory;
import org.jruby.truffle.language.RubyNode;
3 changes: 3 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
Original file line number Diff line number Diff line change
@@ -17,6 +17,9 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.RubyMath;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
Original file line number Diff line number Diff line change
@@ -18,6 +18,10 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.core.cast.DefaultValueNodeGen;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
Original file line number Diff line number Diff line change
@@ -12,6 +12,9 @@
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.dsl.Specialization;
import org.jruby.RubyGC;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;

@CoreClass(name = "Truffle::GC")
public abstract class TruffleGCNodes {
Original file line number Diff line number Diff line change
@@ -13,6 +13,9 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.object.DynamicObject;
import jnr.posix.SpawnFileAction;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.array.ArrayOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.control.RaiseException;
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@
import com.oracle.truffle.api.object.DynamicObject;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.ext.rbconfig.RbConfigLibrary;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
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;

Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
import com.oracle.truffle.api.dsl.ImportStatic;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;

@ImportStatic(ArrayGuards.class)
public abstract class ArrayCoreMethodNode extends CoreMethodArrayArgumentsNode {
Original file line number Diff line number Diff line change
@@ -32,13 +32,13 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.CoreMethodNode;
import org.jruby.truffle.core.CoreSourceSection;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.builtins.CoreSourceSection;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.YieldingCoreMethodNode;
import org.jruby.truffle.builtins.YieldingCoreMethodNode;
import org.jruby.truffle.core.array.ArrayNodesFactory.MaxBlockNodeFactory;
import org.jruby.truffle.core.array.ArrayNodesFactory.MinBlockNodeFactory;
import org.jruby.truffle.core.array.ArrayNodesFactory.RejectInPlaceNodeFactory;
Original file line number Diff line number Diff line change
@@ -24,12 +24,12 @@
import org.jcodings.specific.ASCIIEncoding;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.BinaryCoreMethodNode;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.RubiniusOnly;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.BinaryCoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.RubiniusOnly;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.array.ArrayHelpers;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.core.module.ModuleOperations;
Original file line number Diff line number Diff line change
@@ -21,11 +21,11 @@
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.array.ArrayHelpers;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.arguments.RubyArguments;
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@
import com.oracle.truffle.api.frame.FrameInstanceVisitor;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.object.DynamicObject;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.util.Memo;

@CoreClass(name = "Truffle::Binding")
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@

import com.oracle.truffle.api.dsl.CreateCast;
import com.oracle.truffle.api.dsl.Specialization;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.language.RubyNode;

Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@

import com.oracle.truffle.api.dsl.CreateCast;
import com.oracle.truffle.api.dsl.Specialization;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.language.RubyNode;

Original file line number Diff line number Diff line change
@@ -25,11 +25,11 @@
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.RubiniusOnly;
import org.jruby.truffle.builtins.RubiniusOnly;
import org.jruby.truffle.core.rope.RopeOperations;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
Original file line number Diff line number Diff line change
@@ -23,12 +23,12 @@
import org.jcodings.util.CaseInsensitiveBytesHash;
import org.jcodings.util.Hash;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.RubiniusOnly;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.RubiniusOnly;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.cast.ToStrNode;
import org.jruby.truffle.core.cast.ToStrNodeGen;
import org.jruby.truffle.core.rope.CodeRange;
Original file line number Diff line number Diff line change
@@ -295,6 +295,11 @@ public DynamicObject typeErrorIsNotA(String value, String expectedType, Node cur
return typeError(String.format("%s is not a %s", value, expectedType), currentNode);
}

@TruffleBoundary
public DynamicObject typeErrorIsNotAClassModule(Object value, Node currentNode) {
return typeError(String.format("%s is not a class/module", value), currentNode);
}

@TruffleBoundary
public DynamicObject typeErrorNoImplicitConversion(Object from, String to, Node currentNode) {
return typeError(String.format("no implicit conversion of %s into %s", Layouts.MODULE.getFields(context.getCoreLibrary().getLogicalClass(from)).getName(), to), currentNode);
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.RubiniusOnly;
import org.jruby.truffle.builtins.RubiniusOnly;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.backtrace.Backtrace;
Original file line number Diff line number Diff line change
@@ -19,12 +19,12 @@
import com.oracle.truffle.api.object.DynamicObjectFactory;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.CoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.cast.SingleValueCastNode;
import org.jruby.truffle.core.cast.SingleValueCastNodeGen;
import org.jruby.truffle.core.proc.ProcOperations;
12 changes: 6 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@
import com.oracle.truffle.api.profiles.ConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.CoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.RubiniusOnly;
import org.jruby.truffle.core.YieldingCoreMethodNode;
import org.jruby.truffle.builtins.RubiniusOnly;
import org.jruby.truffle.builtins.YieldingCoreMethodNode;
import org.jruby.truffle.core.array.ArrayBuilderNode;
import org.jruby.truffle.core.basicobject.BasicObjectNodes;
import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory;
Original file line number Diff line number Diff line change
@@ -41,12 +41,12 @@
import org.jruby.common.IRubyWarnings;
import org.jruby.runtime.Visibility;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreClass;
import org.jruby.truffle.core.CoreMethod;
import org.jruby.truffle.core.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.core.CoreMethodNode;
import org.jruby.truffle.builtins.CoreClass;
import org.jruby.truffle.builtins.CoreMethod;
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
import org.jruby.truffle.builtins.CoreMethodNode;
import org.jruby.truffle.core.Layouts;
import org.jruby.truffle.core.UnaryCoreMethodNode;
import org.jruby.truffle.builtins.UnaryCoreMethodNode;
import org.jruby.truffle.core.array.ArrayUtils;
import org.jruby.truffle.core.basicobject.BasicObjectNodes;
import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory;
Loading